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
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2017-11-08 14:22:50 +09:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
br.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_arp_nd_proxy.c	bridge: suppress nd pkts on BR_NEIGH_SUPPRESS ports	2017-10-08 21:12:04 -07:00
br_device.c	net: bridge: use rhashtable for fdbs	2017-12-13 15:10:01 -05:00
br_fdb.c	net: bridge: use rhashtable for fdbs	2017-12-13 15:10:01 -05:00
br_forward.c	bridge: add new BR_NEIGH_SUPPRESS port flag to suppress arp and nd flood	2017-10-08 21:12:04 -07:00
br_if.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_input.c	net: bridge: Rename mglist to host_joined	2017-11-10 13:41:40 +09:00
br_ioctl.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_mdb.c	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
br_multicast.c	net: bridge: Send notification when host join/leaves a group	2017-11-10 13:41:40 +09:00
br_netfilter_hooks.c	netfilter: convert hook list to an array	2017-08-28 17:44:00 +02:00
br_netfilter_ipv6.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
br_netlink.c	net: bridge: fix early call to br_stp_change_bridge_id and plug newlink leaks	2017-12-18 13:29:01 -05:00
br_netlink_tunnel.c	bridge: netlink: make setlink/dellink notifications more accurate	2017-10-29 11:03:43 +09:00
br_nf_core.c	xfrm: Move dst->path into struct xfrm_dst	2017-11-30 09:54:26 -05:00
br_private.h	net: bridge: use rhashtable for fdbs	2017-12-13 15:10:01 -05:00
br_private_stp.h	net: bridge: add helper to set topology change	2016-12-10 21:27:23 -05:00
br_private_tunnel.h	bridge: netlink: make setlink/dellink notifications more accurate	2017-10-29 11:03:43 +09:00
br_stp.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_stp_bpdu.c	net: introduce __skb_put_[zero, data, u8]	2017-06-20 13:30:14 -04:00
br_stp_if.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_stp_timer.c	net: bridge: Convert timers to use timer_setup()	2017-11-03 15:42:49 +09:00
br_switchdev.c	net: bridge: use rhashtable for fdbs	2017-12-13 15:10:01 -05:00
br_sysfs_br.c	bridge: Use helpers to handle MAC address	2017-12-20 12:46:11 -05:00
br_sysfs_if.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_vlan.c	bridge: vlan: signal if anything changed on vlan add	2017-10-29 11:03:43 +09:00
br_vlan_tunnel.c	bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure	2017-02-17 13:33:41 -05:00