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

..

arcnet

…

bonding

bonding: Fix unnecessary warnings and logs from bond_xdp_get_xmit_slave()

2024-09-24 15:19:50 +02:00

caif

…

can

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

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

dsa

net: dsa: mv88e6xxx: Add FID map cache

2024-10-08 15:30:55 -07:00

ethernet

Merge net-next/main to resolve conflicts

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

fddi

…

fjes

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

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

hamradio

Merge tag 'tty-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2024-09-26 09:59:50 -07:00

hippi

…

hyperv

hv_netvsc: Link queues to NAPIs

2024-10-06 16:24:06 +01:00

ieee802154

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

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

ipa

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

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

ipvlan

ipv4: Convert ip_route_input_noref() to dscp_t.

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

mctp

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

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

mdio

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

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

netdevsim

[tree-wide] finally take no_llseek out

2024-09-27 08:18:43 -07:00

pcs

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

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

phy

net: phy: microchip_t1: SQI support for LAN887x

2024-10-08 18:24:16 -07:00

plip

…

ppp

Merge tag 'net-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-10-03 09:44:00 -07:00

pse-pd

…

slip

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

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

team

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

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

thunderbolt

…

usb

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

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

vmxnet3

vmxnet3: support higher link speeds from vmxnet3 v9

2024-10-07 17:04:41 -07:00

vxlan

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

wan

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

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

wireguard

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

wireless

Merge net-next/main to resolve conflicts

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

wwan

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

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

xen-netback

net/xen-netback: prevent UAF in xenvif_flush_hash()

2024-08-28 17:07:42 -07:00

amt.c

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

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

bareudp.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

dummy.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

eql.c

…

geneve.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

gtp.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

ifb.c

…

Kconfig

…

LICENSE.SRC

…

loopback.c

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

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

macsec.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

macvlan.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

macvtap.c

…

Makefile

…

mdio.c

…

mhi_net.c

…

mii.c

…

net_failover.c

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

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

netconsole.c

…

netkit.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

nlmon.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

ntb_netdev.c

…

pfcp.c

…

rionet.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

sb1000.c

…

Space.c

…

sungem_phy.c

…

tap.c

[tree-wide] finally take no_llseek out

2024-09-27 08:18:43 -07:00

tun.c

appletalk: Remove deadcode

2024-10-04 12:42:32 +01:00

veth.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

virtio_net.c

virtio_net: Fix mismatched buf address when unmapping for small packets

2024-09-26 10:35:27 +02:00

vrf.c

vrf: revert "vrf: Remove unnecessary RCU-bh critical section"

2024-10-02 17:26:11 -07:00

vsockmon.c

netdev_features: convert NETIF_F_LLTX to dev->lltx

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

xen-netfront.c

…