]> git.hungrycats.org Git - linux/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 21 May 2026 22:02:54 +0000 (15:02 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 28 May 2026 21:02:21 +0000 (14:02 -0700)
commitd44646fc9eeb423ad50f3043f11f66f491d908a7
tree18e6b3eda2c313c246ba18b88b4e06b2e18432c2
parent0cf905cb9a12dbfb5d14896729b74508f83f73df
parent3e20009988e2470063824c58b19d1c80816cc46d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

Conflicts:

drivers/net/phy/air_en8811h.c
  d895767c33781 ("net: phy: air_en8811h: add AN8811HB MCU assert/deassert support")
  dddfadd75197e ("net: phy: Add Airoha phy library for shared code")
  5226bb6634cdf ("net: phy: air_phy_lib: Factorize BuckPBus register accessors")
  e08f0ea6daf2e ("net: phy: Rename Airoha common BuckPBus register accessors")

net/sched/sch_netem.c
  a2f6ed7b4873 ("net/sched: netem: add per-impairment extended statistics")
  9552b11e3eda ("net/sched: fix packet loop on netem when duplicate is on")

Adjacent changes:

drivers/dpll/zl3073x/core.c
  c1224569cef0 ("dpll: zl3073x: make frequency monitor a per-device attribute")
  54e65df8cf18 ("dpll: zl3073x: report FFO as DPLL vs input reference offset")

net/iucv/af_iucv.c
  347fdd4df85f ("af_iucv: convert to getsockopt_iter")
  3589d20a666c ("net/iucv: fix locking in .getsockopt")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
24 files changed:
MAINTAINERS
drivers/dpll/dpll_netlink.c
drivers/dpll/zl3073x/core.c
drivers/dpll/zl3073x/dpll.c
drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c
drivers/net/phy/air_en8811h.c
drivers/net/phy/air_phy_lib.c
drivers/net/phy/air_phy_lib.h
drivers/net/tun.c
drivers/net/vxlan/vxlan_core.c
include/linux/dpll.h
include/linux/skbuff.h
net/bridge/br_netlink.c
net/bridge/netfilter/ebtables.c
net/core/skbuff.c
net/ethtool/tsconfig.c
net/hsr/hsr_forward.c
net/iucv/af_iucv.c
net/l2tp/l2tp_core.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netlink/af_netlink.c
net/sched/sch_netem.c
net/vmw_vsock/af_vsock.c
tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json