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
..
am65-cpsw-ethtool.c	net: ethernet: ti: ale: add cpsw_ale_get_num_entries api	2020-09-11 17:34:39 -07:00
am65-cpsw-nuss.c	devlink: Set device as early as possible	2021-08-09 10:21:40 +01:00
am65-cpsw-nuss.h	net: ti: am65-cpsw-nuss: fix RX IRQ state after .ndo_stop()	2021-08-06 11:08:57 +01:00
am65-cpsw-qos.c	net: ethernet: ti: am65-cpsw-qos: Demote non-conformant function header	2021-01-16 18:13:10 -08:00
am65-cpsw-qos.h	ethernet: ti: am65-cpsw-qos: add TAPRIO offload support	2020-05-14 17:33:30 -07:00
am65-cpsw-switchdev.c	net: switchdev: zero-initialize struct switchdev_notifier_fdb_info emitted by drivers towards the bridge	2021-08-10 13:22:57 -07:00
am65-cpsw-switchdev.h	net: ti: am65-cpsw-nuss: Add switchdev support	2021-02-11 17:52:13 -08:00
am65-cpts.c	net: ethernet: ti: am65-cpts: Use devm_platform_ioremap_resource_byname()	2021-06-09 15:24:43 -07:00
am65-cpts.h	ethernet: ti: am65-cpts: Add missing inline qualifier to stub functions	2020-05-15 16:32:27 -07:00
cpmac.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
cpsw_ale.c	net: ti: Fix wrong struct name in comments	2021-05-17 14:12:39 -07:00
cpsw_ale.h	net: ethernet: ti: cpsw_ale: add cpsw_ale_vlan_del_modify()	2020-11-02 16:41:07 -08:00
cpsw_ethtool.c	net: ethernet: ti: cpsw: disable PTPv1 hw timestamping advertisement	2020-11-02 14:17:51 -08:00
cpsw_new.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
cpsw_priv.c	net: ethernet: ti: davinci_cpdma: revert "drop frame padding"	2021-08-06 16:18:15 -07:00
cpsw_priv.h	net: ethernet: ti: cpsw: fix min eth packet size for non-switch use-cases	2021-08-09 10:16:46 +01:00
cpsw_sl.c
cpsw_sl.h
cpsw_switchdev.c	net: switchdev: zero-initialize struct switchdev_notifier_fdb_info emitted by drivers towards the bridge	2021-08-10 13:22:57 -07:00
cpsw_switchdev.h
cpsw-common.c
cpsw-phy-sel.c	net: ethernet: ti: cpsw-phy-sel: Use devm_platform_ioremap_resource_byname()	2021-06-09 15:27:55 -07:00
cpsw.c	page_pool: keep pp info as long as page pool owns the page	2021-08-09 15:49:00 -07:00
cpsw.h
cpts.c	net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered	2020-12-28 13:32:34 -08:00
cpts.h
davinci_cpdma.c	net: ethernet: ti: davinci_cpdma: revert "drop frame padding"	2021-08-06 16:18:15 -07:00
davinci_cpdma.h	net: ethernet: ti: davinci_cpdma: revert "drop frame padding"	2021-08-06 16:18:15 -07:00
davinci_emac.c	net: ethernet: ti: davinci_cpdma: revert "drop frame padding"	2021-08-06 16:18:15 -07:00
davinci_mdio.c	drivers: net: davinci_mdio: Use of_device_get_match_data()	2021-01-26 12:17:31 -06:00
k3-cppi-desc-pool.c
k3-cppi-desc-pool.h
Kconfig	Revert "net: build all switchdev drivers as modules when the bridge is a module"	2021-08-04 12:35:07 +01:00
Makefile	net: ti: am65-cpsw-nuss: Add switchdev support	2021-02-11 17:52:13 -08:00
netcp_core.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
netcp_ethss.c	net: netcp: ethss: use dev_id for ale configuration	2020-09-11 17:34:39 -07:00
netcp_sgmii.c
netcp_xgbepcsr.c
netcp.h
tlan.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
tlan.h