superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mirror-linux/drivers/net/ethernet
History
Jakub Kicinski 35c2c39832 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Merge in late fixes in preparation for the net-next PR.

Conflicts:

include/net/sch_generic.h
  a6bd339dbb ("net_sched: fix skb memory leak in deferred qdisc drops")
  ff2998f29f ("net: sched: introduce qdisc-specific drop reason tracing")
https://lore.kernel.org/adz0iX85FHMz0HdO@sirena.org.uk

drivers/net/ethernet/airoha/airoha_eth.c
  1acdfbdb51 ("net: airoha: Fix VIP configuration for AN7583 SoC")
  bf3471e6e6 ("net: airoha: Make flow control source port mapping dependent on nbq parameter")

Adjacent changes:

drivers/net/ethernet/airoha/airoha_ppe.c
  f44218cd5e ("net: airoha: Reset PPE cpu port configuration in airoha_ppe_hw_init()")
  7da62262ec ("inet: add ip_local_port_step_width sysctl to improve port usage distribution")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 		2026-04-14 12:04:00 -07:00
..
3com
…
8390 net: remove unnecessary module_init/exit functions 2026-02-02 17:25:23 -08:00
actions
…
adaptec
…
adi treewide: Replace kmalloc with kmalloc_obj for non-scalar types 2026-02-21 01:02:28 -08:00
aeroflex
…
agere Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
airoha Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
alacritech Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
allwinner treewide: Replace kmalloc with kmalloc_obj for non-scalar types 2026-02-21 01:02:28 -08:00
altera net: altera-tse: fix skb leak on DMA mapping error in tse_start_xmit() 2026-04-02 18:25:23 -07:00
amazon net: ena: convert to use .get_rx_ring_count 2026-01-17 18:10:16 -08:00
amd declance: Include the offending address with DMA errors 2026-03-31 19:32:41 -07:00
apm Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
apple
…
aquantia net: atlantic: fix reading SFP module info on some AQC100 cards 2026-02-26 19:20:53 -08:00
arc net: ethernet: arc: emac: quiesce interrupts before requesting IRQ 2026-03-10 19:05:12 -07:00
asix
…
atheros Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
brocade Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
cadence net: macb: Use napi_schedule_irqoff() in IRQ handler 2026-04-09 20:17:31 -07:00
calxeda Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
cavium Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
chelsio ipv6: convert CONFIG_IPV6 to built-in only and clean up Kconfigs 2026-03-29 11:21:22 -07:00
cirrus
…
cisco enic: detect admin channel resources for SR-IOV 2026-04-02 18:05:06 -07:00
cortina Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
davicom
…
dec
…
dlink
…
emulex Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
engleder Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
ezchip
…
faraday net: ftgmac100: fix ring allocation unwind on open failure 2026-03-31 19:38:36 -07:00
freescale net: enetc: add unstructured counters for ENETC v4 2026-04-12 13:03:48 -07:00
fujitsu
…
fungible Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
google gve: add support for UDP GSO for DQO format 2026-03-09 19:17:52 -07:00
hisilicon Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
huawei hinic3: Fix spelling mistake "capbility" -> "capability" 2026-03-14 08:46:41 -07:00
i825xx
…
ibm Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-02-26 10:23:00 -08:00
intel iavf: fix kernel-doc comment style in iavf_ethtool.c 2026-04-10 16:05:44 -07:00
litex net: ethernet: litex: use device pointer to simplify code. 2026-02-27 19:25:16 -08:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
mediatek Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
mellanox Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
meta Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
micrel Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
microchip net: lan743x: rename chip_rev to fpga_rev 2026-04-12 09:41:56 -07:00
microsoft Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
moxa
…
mscc Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
mucse
…
myricom Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
natsemi
…
netronome drivers: net: drop ipv6_stub usage and use direct function calls 2026-03-29 11:21:23 -07:00
ni
…
nvidia Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
nxp
…
oki-semi
…
packetengines
…
pasemi Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
pensando Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-03-26 12:09:57 -07:00
qlogic qed: Reimplement qed_mcast_bin_from_mac() using library functions 2026-03-18 19:07:37 -07:00
qualcomm net: qualcomm: qca_uart: report the consumed byte on RX skb allocation failure 2026-04-03 15:32:56 -07:00
rdc
…
realtek r8169: add support for RTL8125cp 2026-03-05 13:41:48 +01:00
renesas net: ethernet: ravb: Suspend and resume the transmission flow 2026-04-03 16:04:28 -07:00
rocker net: rocker: kzalloc + kcalloc to kzalloc_flex 2026-03-09 18:51:07 -07:00
samsung Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
seeq
…
sfc sfc: add transmit timestamping support 2026-03-31 19:19:09 -07:00
sgi
…
silan
…
sis Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
smsc Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 2026-02-21 20:03:00 -08:00
socionext Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
spacemit Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-03-12 12:53:34 -07:00
stmicro net: stmmac: enable RPS and RBU interrupts 2026-04-13 14:34:38 -07:00
sun Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
sunplus treewide: Replace kmalloc with kmalloc_obj for non-scalar types 2026-02-21 01:02:28 -08:00
synopsys Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
tehuti
…
ti net: ethernet: ti: am65-cpsw: add support for J722S SoC family 2026-04-12 08:29:03 -07:00
toshiba Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
tundra
…
vertexcom
…
via Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses 2026-02-22 08:26:33 -08:00
wangxun Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-14 12:04:00 -07:00
wiznet
…
xilinx net: xilinx: axienet: Fix BQL accounting for multi-BD TX packets 2026-03-31 12:09:12 +02:00
xircom
…
xscale net: ethernet: xscale: Check for PTP support properly 2026-02-20 16:10:24 -08:00
Kconfig eth: remove the driver for acenic / tigon1&2 2026-04-06 18:52:27 -07:00
Makefile eth: remove the driver for acenic / tigon1&2 2026-04-06 18:52:27 -07:00
ec_bhf.c net: ethernet: ec_bhf: Fix dma_free_coherent() dma handle 2026-02-17 17:16:55 -08:00
ethoc.c
…
fealnx.c
…
jme.c treewide: Replace kmalloc with kmalloc_obj for non-scalar types 2026-02-21 01:02:28 -08:00
jme.h
…
korina.c
…
lantiq_etop.c
…
lantiq_xrx200.c
…
oa_tc6.c
…