Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h 9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp") 9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins") 099fdeda65 ("bnxt_en: Event handler for PPS events") kernel/bpf/helpers.c include/linux/bpf-cgroup.h a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()") c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current") drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c 5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray") 2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer") MAINTAINERS 7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo") 7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-08-13 06:41:22 -07:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
Kconfig	…
Makefile	net: bridge: multicast: add EHT host handling functions	2021-01-22 19:39:56 -08:00
br.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
br_arp_nd_proxy.c	net: bridge: when suppression is enabled exclude RARP packets	2021-03-22 13:30:24 -07:00
br_cfm.c	bridge: cfm: remove redundant return	2021-06-22 10:35:15 -07:00
br_cfm_netlink.c	…
br_device.c	net: bridge: move bridge ioctls out of .ndo_do_ioctl	2021-07-27 20:11:45 +01:00
br_fdb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
br_forward.c	net: bridge: fix build when setting skb->offload_fwd_mark with CONFIG_NET_SWITCHDEV=n	2021-07-24 21:48:26 +01:00
br_if.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
br_input.c	net: bridge: add vlan mcast snooping knob	2021-07-20 05:41:20 -07:00
br_ioctl.c	net: bridge: fix ioctl old_deviceless bridge argument	2021-08-05 11:36:59 +01:00
br_mdb.c	net: bridge: vlan: use br_rports_fill_info() to export mcast router ports	2021-08-11 13:34:41 +01:00
br_mrp.c	net: bridge: mrp: Update the Test frames for MRA	2021-06-28 15:46:10 -07:00
br_mrp_netlink.c	…
br_mrp_switchdev.c	bridge: mrp: Extend br_mrp_switchdev to detect better the errors	2021-02-16 14:47:46 -08:00
br_multicast.c	net: bridge: vlan: add support for mcast router global option	2021-08-11 13:34:41 +01:00
br_multicast_eht.c	net: bridge: multicast: use multicast contexts instead of bridge or port	2021-07-20 05:41:19 -07:00
br_netfilter_hooks.c	…
br_netfilter_ipv6.c	…
br_netlink.c	net: bridge: vlan: add support for mcast router global option	2021-08-11 13:34:41 +01:00
br_netlink_tunnel.c	…
br_nf_core.c	…
br_private.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
br_private_cfm.h	…
br_private_mcast_eht.h	net: bridge: multicast: use multicast contexts instead of bridge or port	2021-07-20 05:41:19 -07:00
br_private_mrp.h	net: bridge: mrp: Update the Test frames for MRA	2021-06-28 15:46:10 -07:00
br_private_stp.h	…
br_private_tunnel.h	…
br_stp.c	net: bridge: constify variables in the replay helpers	2021-06-28 14:09:03 -07:00
br_stp_bpdu.c	…
br_stp_if.c	…
br_stp_timer.c	…
br_switchdev.c	net: make switchdev_bridge_port_{,unoffload} loosely coupled with the bridge	2021-08-04 12:35:07 +01:00
br_sysfs_br.c	net: bridge: vlan: add support for mcast router global option	2021-08-11 13:34:41 +01:00
br_sysfs_if.c	net: bridge: multicast: factor out port multicast context	2021-07-20 05:41:19 -07:00
br_vlan.c	net: bridge: vlan: fix global vlan option range dumping	2021-08-11 16:02:34 -07:00
br_vlan_options.c	net: bridge: vlan: use br_rports_fill_info() to export mcast router ports	2021-08-11 13:34:41 +01:00
br_vlan_tunnel.c	net: bridge: fix vlan tunnel dst refcnt when egressing	2021-06-10 14:06:43 -07:00