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

..

6lowpan

…

9p

…

802

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

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

8021q

…

appletalk

appletalk: Remove deadcode

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

atm

…

ax25

…

batman-adv

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

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

bluetooth

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

bpf

…

bridge

ipv4: Convert ip_route_input() to dscp_t.

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

caif

caif: Remove unused cfsrvl_getphyid

2024-10-08 15:33:49 -07:00

can

net_tstamp: add SCM_TS_OPT_ID for RAW sockets

2024-10-04 11:52:19 -07:00

ceph

…

core

net-timestamp: namespacify the sysctl_tstamp_allow_data

2024-10-08 15:33:11 -07:00

dcb

…

dccp

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

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

devlink

…

dns_resolver

…

dsa

net: dsa: remove obsolete phylink dsa_switch operations

2024-10-07 16:23:10 -07:00

ethernet

…

ethtool

ethtool: rss: fix rss key initialization warning

2024-10-04 12:34:13 -07:00

handshake

…

hsr

…

ieee802154

…

ife

…

ipv4

ipv4: remove fib_info_devhash[]

2024-10-07 16:46:27 -07:00

ipv6

tcp: annotate data-races around icsk->icsk_pending

2024-10-04 15:34:39 -07:00

iucv

…

kcm

…

key

…

l2tp

…

l3mdev

…

lapb

…

llc

…

mac80211

Merge net-next/main to resolve conflicts

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

mac802154

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

mctp

…

mpls

…

mptcp

tcp: add a fast path in tcp_delack_timer()

2024-10-04 15:34:40 -07:00

ncsi

net/ncsi: Disable the ncsi work before freeing the associated structure

2024-10-03 10:14:14 +02:00

netfilter

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

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

netlabel

…

netlink

…

netrom

…

nfc

…

nsh

…

openvswitch

…

packet

net_tstamp: add SCM_TS_OPT_ID for RAW sockets

2024-10-04 11:52:19 -07:00

phonet

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

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

psample

…

qrtr

net: qrtr: Update packets cloning when broadcasting

2024-09-24 10:48:16 +02:00

rds

net/rds: remove unused struct 'rds_ib_dereg_odp_mr'

2024-10-03 16:42:52 -07:00

rfkill

[tree-wide] finally take no_llseek out

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

rose

…

rxrpc

…

sched

net_sched: sch_fq: add the ability to offload pacing

2024-10-04 15:37:54 -07:00

sctp

sctp: set sk_state back to CLOSED if autobind fails in sctp_listen_start

2024-10-03 12:18:29 +02:00

smc

…

strparser

…

sunrpc

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

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

switchdev

…

tipc

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

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

tls

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

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

unix

…

vmw_vsock

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2024-09-26 08:43:17 -07:00

wireless

Merge net-next/main to resolve conflicts

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

x25

…

xdp

Merge tag 'bpf-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2024-09-21 09:27:50 -07:00

xfrm

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

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

compat.c

…

devres.c

…

Kconfig

memory-provider: disable building dmabuf mp on !CONFIG_PAGE_POOL

2024-09-13 11:41:45 -07:00

Kconfig.debug

rtnetlink: Add per-netns RTNL.

2024-10-08 15:16:59 +02:00

Makefile

…

socket.c

net_tstamp: add SCM_TS_OPT_ID for RAW sockets

2024-10-04 11:52:19 -07:00

sysctl_net.c

…