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

Cross-merge networking fixes after downstream PR (net-7.1-rc8).

Conflicts:

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
  f67aead16e ("net: txgbe: rework service event handling")
  57d39faed4 ("net: txgbe: improve functions of AML 40G devices")

net/rds/info.c
  512db8267b ("rds: mark snapshot pages dirty in rds_info_getsockopt()")
  6e94eeb2a2 ("rds: convert to getsockopt_iter")

Adjacent changes:

include/net/sock.h
  1ee90b77b7 ("net: guard timestamp cmsgs to real error queue skbs")
  f0de88303d ("net: make is_skb_wmem() available to modules")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2026-06-11 14:33:35 -07:00

..

tc_act

…

acct.h

tools headers UAPI: sync linux/taskstats.h for procacct.c

2026-06-03 16:25:50 -07:00

bits.h

uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)

2025-07-08 10:23:13 -04:00

bpf_common.h

…

bpf_perf_event.h

…

bpf.h

bpf: Clarify BPF_RB_NO_WAKEUP behavior for bpf_ringbuf_discard()

2026-03-31 15:46:34 -07:00

btf.h

btf: Add BTF kind layout encoding to UAPI

2026-03-26 13:53:56 -07:00

const.h

…

coredump.h

tools: add coredump.h header

2025-06-12 14:00:32 +02:00

elf.h

…

erspan.h

…

fanotify.h

selftests/fs/mount-notify: build with tools include dir

2025-05-12 11:40:12 +02:00

filter.h

…

fs.h

tools headers UAPI: sync linux/fs.h with the kernel sources

2025-05-11 17:48:16 -07:00

fscrypt.h

tools headers: Update the fs headers with the kernel sources

2025-06-16 14:05:10 -03:00

genetlink.h

tools include: Add headers to make tools builds more hermetic

2025-10-02 15:13:19 -03:00

hw_breakpoint.h

…

if_addr.h

tools include: Add headers to make tools builds more hermetic

2025-10-02 15:13:19 -03:00

if_link.h

bonding: 3ad: add lacp_strict configuration knob

2026-06-10 07:53:26 -07:00

if_tun.h

…

if_xdp.h

net: xsk: introduce XDP_MAX_TX_SKB_BUDGET setsockopt

2025-07-10 14:48:29 +02:00

in.h

tools headers: Update the socket headers with the kernel sources

2025-04-10 09:28:24 -07:00

io_uring.h

…

kcmp.h

…

kvm.h

Merge tag 'kvmarm-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

2026-04-13 11:49:54 +02:00

memfd.h

…

mman.h

…

module_signature.h

tools uapi headers: add linux/module_signature.h

2026-03-24 21:42:37 +00:00

mount.h

tools: update mount.h header

2026-03-12 13:33:54 +01:00

neighbour.h

tools include: Add headers to make tools builds more hermetic

2025-10-02 15:13:19 -03:00

netdev.h

net: Add queue-create operation

2026-04-09 18:21:45 -07:00

netfilter_arp.h

tools include: Add headers to make tools builds more hermetic

2025-10-02 15:13:19 -03:00

netfilter.h

tools include: Add headers to make tools builds more hermetic

2025-10-02 15:13:19 -03:00

netlink.h

…

nsfs.h

nsfs: update tools header

2025-11-03 17:41:18 +01:00

perf_event.h

perf beauty: Update the linux/perf_event.h copy with the kernel sources

2026-03-04 11:51:36 -03:00

pkt_cls.h

…

pkt_sched.h

…

prctl.h

Merge tag 'core-entry-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2025-07-29 15:14:29 -07:00

rtnetlink.h

tools include: Add headers to make tools builds more hermetic

2025-10-02 15:13:19 -03:00

seccomp.h

…

seg6_local.h

…

seg6.h

…

stat.h

tools headers: Update the fs headers with the kernel sources

2025-06-16 14:05:10 -03:00

stddef.h

tools/headers: Regenerate stddef.h to fix BPF selftests

2026-05-02 09:37:44 -07:00

taskstats.h

tools headers UAPI: sync linux/taskstats.h

2026-03-27 21:19:43 -07:00

tcp.h

…

tls.h

…

types.h

tools/include: make uapi/linux/types.h usable from assembly

2025-04-06 12:55:31 -07:00

userfaultfd.h

…