diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-03 03:26:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-03 03:29:26 +0200 |
| commit | 5cd3da4ba2397ef07226ca2aa5094ed21ff8198f (patch) | |
| tree | caa3c5968df02c296e9644a98c00e759d011b44c /block/blk-cgroup.c | |
| parent | Merge branch 'hns3-a-few-code-improvements' (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| download | linux-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.tar.xz linux-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.zip | |
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>
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions