diff options
author | David S. Miller | 2017-12-22 17:16:31 +0100 |
---|---|---|
committer | David S. Miller | 2017-12-22 17:16:31 +0100 |
commit | fba961ab29e5ffb055592442808bb0f7962e05da (patch) | |
tree | 5180c384b79399c469e0ed88211114e6ab249484 /net/smc/smc_close.c | |
parent | Merge branch 'flow_dissector-Provide-basic-batman-adv-unicast-handling' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-fba961ab29e5ffb055592442808bb0f7962e05da.tar.gz kernel-qcow2-linux-fba961ab29e5ffb055592442808bb0f7962e05da.tar.xz kernel-qcow2-linux-fba961ab29e5ffb055592442808bb0f7962e05da.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of overlapping changes. Also on the net-next side
the XDP state management is handled more in the generic
layers so undo the 'net' nfp fix which isn't applicable
in net-next.
Include a necessary change by Jakub Kicinski, with log message:
====================
cls_bpf no longer takes care of offload tracking. Make sure
netdevsim performs necessary checks. This fixes a warning
caused by TC trying to remove a filter it has not added.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_close.c')
0 files changed, 0 insertions, 0 deletions