1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/aquantia/atlantic
Jakub Kicinski 9b19e57a3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.

Build issue in drivers/net/ethernet/sfc/ptp.c
  54fccfdd7c ("sfc: efx_default_channel_type APIs can be static")
  49e6123c65 ("net: sfc: fix memory leak due to ptp channel")
https://lore.kernel.org/all/20220510130556.52598fe2@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-05-12 16:15:30 -07:00
..
hw_atl Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-05-12 16:15:30 -07:00
hw_atl2 atlantic: Fix statistics logic for production hardware 2021-11-29 14:24:22 +00:00
macsec net: atlantic: minor MACSec code cleanup 2020-05-09 11:47:25 -07:00
aq_cfg.h eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define 2022-04-29 11:56:41 +01:00
aq_common.h atlantic: Add missing DIDs and fix 115c. 2021-11-29 14:24:21 +00:00
aq_drvinfo.c net: atlantic: add hwmon getter for MAC temperature 2020-07-20 18:07:39 -07:00
aq_drvinfo.h net: atlantic: add hwmon getter for MAC temperature 2020-07-20 18:07:39 -07:00
aq_ethtool.c net: atlantic: Implement xdp data plane 2022-04-20 10:42:57 +01:00
aq_ethtool.h net: atlantic: loopback tests via private flags 2019-11-07 19:54:43 -08:00
aq_filters.c net: atlantic: Use the bitmap API instead of hand-writing it 2022-01-24 12:57:01 +00:00
aq_filters.h net: aquantia: make all files GPL-2.0-only 2019-06-27 10:58:32 -07:00
aq_hw.h atlantic: Fix statistics logic for production hardware 2021-11-29 14:24:22 +00:00
aq_hw_utils.c net: atlantic: use U32_MAX in aq_hw_utils.c 2020-07-20 18:07:38 -07:00
aq_hw_utils.h net: atlantic: add support for 64-bit reads/writes 2020-07-20 18:07:38 -07:00
aq_macsec.c ethernet: constify references to netdev->dev_addr in drivers 2021-10-14 09:22:11 -07:00
aq_macsec.h net: atlantic: fix the macsec key length 2021-06-24 12:41:13 -07:00
aq_main.c net: atlantic: Implement .ndo_xdp_xmit handler 2022-04-20 10:42:57 +01:00
aq_main.h net: atlantic: Implement xdp control plane 2022-04-20 10:42:57 +01:00
aq_nic.c net: atlantic: Implement xdp data plane 2022-04-20 10:42:57 +01:00
aq_nic.h net: atlantic: Implement xdp data plane 2022-04-20 10:42:57 +01:00
aq_pci_func.c net: atlantic: always deep reset on pm op, fixing up my null deref regression 2022-05-10 10:29:54 +02:00
aq_pci_func.h net: atlantic: make aq_pci_func_init static 2020-06-26 16:32:50 -07:00
aq_phy.c net: atlantic: disable PTP on AQC111, AQC112 2020-07-17 18:24:32 -07:00
aq_phy.h net: atlantic: disable PTP on AQC111, AQC112 2020-07-17 18:24:32 -07:00
aq_ptp.c eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define 2022-04-29 11:56:41 +01:00
aq_ptp.h net: atlantic: PTP statistics 2020-07-20 18:07:38 -07:00
aq_ring.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-05-12 16:15:30 -07:00
aq_ring.h net: atlantic: Implement .ndo_xdp_xmit handler 2022-04-20 10:42:57 +01:00
aq_rss.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_utils.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_vec.c eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define 2022-04-29 11:56:41 +01:00
aq_vec.h net: atlantic: Implement xdp control plane 2022-04-20 10:42:57 +01:00
Makefile net: atlantic: fix build when object tree is separate 2020-09-25 17:19:14 -07:00