Jakub Kicinski
d44646fc9e
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
d895767c33 ("net: phy: air_en8811h: add AN8811HB MCU assert/deassert support")
dddfadd751 ("net: phy: Add Airoha phy library for shared code")
5226bb6634 ("net: phy: air_phy_lib: Factorize BuckPBus register accessors")
e08f0ea6da ("net: phy: Rename Airoha common BuckPBus register accessors")
net/sched/sch_netem.c
a2f6ed7b48 ("net/sched: netem: add per-impairment extended statistics")
9552b11e3e ("net/sched: fix packet loop on netem when duplicate is on")
Adjacent changes:
drivers/dpll/zl3073x/core.c
c1224569ce ("dpll: zl3073x: make frequency monitor a per-device attribute")
54e65df8cf ("dpll: zl3073x: report FFO as DPLL vs input reference offset")
net/iucv/af_iucv.c
347fdd4df8 ("af_iucv: convert to getsockopt_iter")
3589d20a66 ("net/iucv: fix locking in .getsockopt")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>