| commit | 5cd3da4ba2397ef07226ca2aa5094ed21ff8198f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Jul 03 10:26:50 2018 +0900 |
| committer | David S. Miller <davem@davemloft.net> | Tue Jul 03 10:29:26 2018 +0900 |
| tree | caa3c5968df02c296e9644a98c00e759d011b44c | |
| parent | f6779e4e53b6177c319f05b61a5c447137d0ab70 [diff] | |
| parent | d0fbad0aec1df29717fab736eb24c8a49cf2c70b [diff] |
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>