diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-06-12 00:29:53 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-06-12 00:33:35 +0300 |
| commit | dad4d4b92a9b9f0edb8c66deda049da1b62f6089 (patch) | |
| tree | 97101d61ab6bcfead33249c92b8d9b931758ae73 /tools/lib/python | |
| parent | 518d8d0199538a4d6d5e51064044ece71e0c42e7 (diff) | |
| parent | 22e2036479cb77df6281ebbd376ae6c330774790 (diff) | |
| download | linux-dad4d4b92a9b9f0edb8c66deda049da1b62f6089.tar.xz | |
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
f67aead16e85 ("net: txgbe: rework service event handling")
57d39faed4c9 ("net: txgbe: improve functions of AML 40G devices")
net/rds/info.c
512db8267b73 ("rds: mark snapshot pages dirty in rds_info_getsockopt()")
6e94eeb2a2a6 ("rds: convert to getsockopt_iter")
Adjacent changes:
include/net/sock.h
1ee90b77b727 ("net: guard timestamp cmsgs to real error queue skbs")
f0de88303d5e ("net: make is_skb_wmem() available to modules")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/lib/python')
0 files changed, 0 insertions, 0 deletions