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
..
Kconfig	net: dsa: tag_sja1105: optionally build as module when switch driver is module if PTP is enabled	2021-08-05 13:30:14 +01:00
Makefile	net: dsa: build tag_8021q.c as part of DSA core	2021-07-20 06:36:42 -07:00
dsa.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
dsa2.c	net: dsa: tag_8021q: don't broadcast during setup/teardown	2021-08-12 11:46:21 +01:00
dsa_priv.h	net: dsa: tag_8021q: don't broadcast during setup/teardown	2021-08-12 11:46:21 +01:00
master.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
port.c	net: dsa: tag_8021q: don't broadcast during setup/teardown	2021-08-12 11:46:21 +01:00
slave.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
switch.c	net: dsa: tag_8021q: add proper cross-chip notifier support	2021-07-20 06:36:42 -07:00
tag_8021q.c	net: dsa: tag_8021q: don't broadcast during setup/teardown	2021-08-12 11:46:21 +01:00
tag_ar9331.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_brcm.c	net: dsa: create a helper for locating EtherType DSA headers on RX	2021-08-11 14:44:58 +01:00
tag_dsa.c	net: dsa: create a helper for locating EtherType DSA headers on TX	2021-08-11 14:44:58 +01:00
tag_gswip.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_hellcreek.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_ksz.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_lan9303.c	net: dsa: create a helper for locating EtherType DSA headers on TX	2021-08-11 14:44:58 +01:00
tag_mtk.c	net: dsa: create a helper for locating EtherType DSA headers on TX	2021-08-11 14:44:58 +01:00
tag_ocelot.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_ocelot_8021q.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_qca.c	net: dsa: create a helper for locating EtherType DSA headers on TX	2021-08-11 14:44:58 +01:00
tag_rtl4_a.c	net: dsa: create a helper for locating EtherType DSA headers on TX	2021-08-11 14:44:58 +01:00
tag_sja1105.c	net: dsa: create a helper for locating EtherType DSA headers on TX	2021-08-11 14:44:58 +01:00
tag_trailer.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00
tag_xrs700x.c	net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv()	2021-08-02 15:13:15 +01:00