OpenCloudOS-Kernel/drivers/s390
David S. Miller fba961ab29 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>
2017-12-22 11:16:31 -05:00
..
block s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00
char s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00
cio s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00
crypto s390: crypto: Remove redundant license text 2017-11-24 14:28:46 +01:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-12-22 11:16:31 -05:00
scsi s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00
virtio s390: drivers: Remove redundant license text 2017-11-24 14:28:47 +01:00
Makefile s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00