tree caa3c5968df02c296e9644a98c00e759d011b44c
parent f6779e4e53b6177c319f05b61a5c447137d0ab70
parent d0fbad0aec1df29717fab736eb24c8a49cf2c70b
author David S. Miller <davem@davemloft.net> 1530581210 +0900
committer David S. Miller <davem@davemloft.net> 1530581366 +0900

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Simple overlapping changes in stmmac driver.

Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>