David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
netfilter	netfilter: nft_reject_bridge: enable reject with bridge vlan	2020-05-25 20:39:05 +02:00
br_arp_nd_proxy.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_device.c	bridge: mrp: Integrate MRP into the bridge	2020-04-27 11:40:25 -07:00
br_fdb.c	net: bridge: fdb: eliminate extra port state tests from fast-path	2019-11-04 11:15:27 -08:00
br_forward.c	net: bridge: check port state before br_allowed_egress	2020-01-24 12:58:14 +01:00
br_if.c	net: bridge: allow enslaving some DSA master network devices	2020-05-10 19:52:33 -07:00
br_input.c	net: bridge: allow enslaving some DSA master network devices	2020-05-10 19:52:33 -07:00
br_ioctl.c	net: bridge: Add checks for enabling the STP.	2020-04-27 11:40:25 -07:00
br_mdb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
br_mrp_netlink.c	bridge: mrp: Rework the MRP netlink interface	2020-05-27 11:30:43 -07:00
br_mrp_switchdev.c	bridge: switchdev: mrp: Implement MRP API for switchdev	2020-04-27 11:40:25 -07:00
br_mrp.c	bridge: mrp: Rework the MRP netlink interface	2020-05-27 11:30:43 -07:00
br_multicast.c	bridge: multicast: work around clang bug	2020-05-27 11:34:48 -07:00
br_netfilter_hooks.c	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04:00
br_netfilter_ipv6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-06-25 01:32:59 +02:00
br_netlink_tunnel.c	net: bridge: vlan options: add support for tunnel mapping set/del	2020-03-17 22:47:12 -07:00
br_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-06 22:10:13 -07:00
br_nf_core.c	net: add bool confirm_neigh parameter for dst_ops.update_pmtu	2019-12-24 22:28:54 -08:00
br_private_mrp.h	bridge: mrp: Rework the MRP netlink interface	2020-05-27 11:30:43 -07:00
br_private_stp.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_private_tunnel.h	net: bridge: vlan options: add support for tunnel mapping set/del	2020-03-17 22:47:12 -07:00
br_private.h	net: bridge: allow enslaving some DSA master network devices	2020-05-10 19:52:33 -07:00
br_stp_bpdu.c	net: bridge: add STP xstats	2019-12-14 20:02:36 -08:00
br_stp_if.c	net: remove newlines in NL_SET_ERR_MSG_MOD	2020-05-07 17:56:14 -07:00
br_stp_timer.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_stp.c	net: bridge: Add checks for enabling the STP.	2020-04-27 11:40:25 -07:00
br_switchdev.c	net: bridge: fdb: convert offloaded to use bitops	2019-10-29 18:12:49 -07:00
br_sysfs_br.c	net: bridge: Add checks for enabling the STP.	2020-04-27 11:40:25 -07:00
br_sysfs_if.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_vlan_options.c	net: bridge: vlan options: move the tunnel command to the nested attribute	2020-03-20 08:52:20 -07:00
br_vlan_tunnel.c	net: bridge: vlan tunnel: constify bridge and port arguments	2020-03-17 22:47:12 -07:00
br_vlan.c	net: bridge: vlan options: nest the tunnel id into a tunnel info attribute	2020-03-20 08:52:20 -07:00
br.c	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
Kconfig	bridge: mrp: Update Kconfig	2020-04-27 11:40:25 -07:00
Makefile	bridge: mrp: Connect MRP API with the switchdev API	2020-04-27 11:40:25 -07:00