Johannes Berg a0efa2f362 Merge net-next/main to resolve conflicts ...

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2024-10-09 08:59:22 +02:00

..

3com

net: annotate data-races around dev->if_port

2024-05-08 18:51:30 -07:00

8390

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

actions

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

adaptec

net: ethernet: starfire: remove unused structs

2024-05-28 15:21:04 +02:00

adi

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

aeroflex

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

agere

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

alacritech

net: alacritech: Partially revert "net: alacritech: Switch to use dev_err_probe()"

2024-09-03 15:28:57 -07:00

allwinner

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

alteon

net: alteon: Convert tasklet API to new bottom half workqueue mechanism

2024-07-31 18:59:46 -07:00

altera

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

amazon

ena: Link queues to NAPIs

2024-10-03 16:13:47 -07:00

amd

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

apm

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

apple

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

aquantia

net: atlantic: convert comma to semicolon

2024-09-06 18:05:53 -07:00

arc

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

asix

net: asix: fix fortify warning

2023-12-12 13:20:37 -08:00

atheros

net: ag71xx: move assignment into main loop

2024-10-04 08:56:27 -07:00

broadcom

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

brocade

bna: adjust 'name' buf size of bna_tcb and bna_ccb structures

2024-07-12 01:56:48 +01:00

cadence

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

calxeda

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

cavium

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

chelsio

chelsio/chtls: Remove unused chtls_set_tcb_tflag

2024-10-08 15:34:38 -07:00

cirrus

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

cisco

enic: Report some per queue statistics in ethtool

2024-09-13 21:17:12 -07:00

cortina

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

davicom

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

dec

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

dlink

net: ethernet: dlink: replace deprecated macro

2024-08-14 12:20:55 +01:00

emulex

be2net: Remove unused declarations

2024-09-03 15:38:22 -07:00

engleder

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

ezchip

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

faraday

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

freescale

fsl/fman: Fix a typo

2024-10-08 18:14:47 -07:00

fujitsu

net: handle HAS_IOPORT dependencies

2024-04-08 11:56:56 +01:00

fungible

net/funeth: Remove setting of RX software timestamp

2024-09-09 17:44:41 -07:00

google

gve: Map NAPI instances to queues

2024-10-03 16:58:26 -07:00

hisilicon

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

huawei

net: hinic: use ethtool_sprintf/puts

2024-08-13 11:59:37 +02:00

i825xx

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

ibm

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

intel

idpf: Don't hard code napi_struct size

2024-10-08 08:14:50 -07:00

litex

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

marvell

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

mediatek

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

mellanox

mlxsw: spectrum_acl_flex_keys: Constify struct mlxsw_afk_element_inst

2024-10-07 16:35:03 -07:00

meta

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

micrel

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

microchip

net: sparx5: redefine internal ports and PGID's as offsets

2024-10-08 12:07:02 +02:00

microsoft

net: mana: Add get_link and get_link_ksettings in ethtool

2024-10-03 13:47:26 +02:00

moxa

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

mscc

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

myricom

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

natsemi

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

neterion

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

netronome

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

ni

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

nvidia

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

nxp

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

oki-semi

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

packetengines

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

pasemi

netdev_features: convert NETIF_F_LLTX to dev->lltx

2024-09-03 11:36:43 +02:00

pensando

ionic: Allow XDP program to be hot swapped

2024-09-09 19:18:15 -07:00

qlogic

qed: put cond_resched() in qed_dmae_operation_wait()

2024-10-04 09:25:15 -07:00

qualcomm

net: qcom/emac: Find sgmii_ops by device_for_each_child()

2024-10-08 09:34:06 +02:00

rdc

…

realtek

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

renesas

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

rocker

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

2024-09-03 11:36:43 +02:00

samsung

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

seeq

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

sfc

sfc: add per-queue RX bytes stats

2024-10-06 16:02:23 +01:00

sgi

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

silan

…

sis

net: annotate data-races around dev->if_port

2024-05-08 18:51:30 -07:00

smsc

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

socionext

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

stmicro

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

sun

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

sunplus

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

synopsys

net: dwc-xlgmac: fix missing MODULE_DESCRIPTION() warning

2024-06-17 18:05:38 -07:00

tehuti

netdev_features: convert NETIF_F_LLTX to dev->lltx

2024-09-03 11:36:43 +02:00

ti

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

toshiba

wifi: remove iw_public_data from struct net_device

2024-10-08 21:53:40 +02:00

tundra

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

vertexcom

net: vertexcom: mse102x: Use ETH_ZLEN

2024-08-29 11:39:35 -07:00

via

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

wangxun

net: wangxun: txgbe: use phylink_pcs internally

2024-10-02 17:32:00 -07:00

wiznet

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

xilinx

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

xircom

net: annotate data-races around dev->if_port

2024-05-08 18:51:30 -07:00

xscale

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

dnet.c

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

dnet.h

…

ec_bhf.c

net: fill in MODULE_DESCRIPTION()s for ec_bhf

2024-01-29 12:12:51 +00:00

ethoc.c

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

fealnx.c

…

jme.c

net: ethernet: use ip_hdrlen() instead of bit shift

2024-08-11 04:41:15 +01:00

jme.h

…

Kconfig

net: ethernet: oa_tc6: implement register write operation

2024-09-11 20:53:42 -07:00

korina.c

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

lantiq_etop.c

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

lantiq_xrx200.c

net: ethernet: Switch back to struct platform_driver::remove()

2024-10-04 16:39:56 -07:00

Makefile

net: ethernet: oa_tc6: implement register write operation

2024-09-11 20:53:42 -07:00

oa_tc6.c

net: ethernet: oa_tc6: add helper function to enable zero align rx frame

2024-09-11 20:53:45 -07:00