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

Browse source

Cross-merge networking fixes after downstream PR (net-7.3-rc5).

Conflicts:

drivers/net/mdio/mdio-realtek-rtl9300.c
  89a8a1eef2 ("net: mdio: realtek-rtl9300: fix RTL931x C22 extended page selection")
  cc3cb8db1e ("net: mdio: realtek-rtl9300: Add page tracking")
https://lore.kernel.org/arUZOqy73bE2pp0w@sirena.org.uk

net/8021q/vlan_dev.c
  cd5dd68267 ("vlan: ensure sufficient headroom in vlan_dev_hard_header()")
  ca6ff8dd70 ("vlan: annotate data-races in vlan_dev_priv fields")

Adjacent changes:

net/ipv6/ip6_gre.c
  dd47bcf279 ("ip6_gre: Call ip6erspan_tunnel_unlink_md() in ip6erspan_changelink().")
  cce829e2aa ("ip6_gre: Protect ip6gre_net.tunnels[][] with mutex.")

drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
  b5d9e9d4d0 ("eth: fbnic: use the Rx queue napi pointer to find the napi vector")
  c0aca269ec ("eth: fbnic: Make Rx completion coalescing configurable")

drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
  d68acbf935 ("net: stmmac: selftests: Support running selftests on DSA conduits")
  85ca3292d7 ("net: stmmac: Remove ARP offload code")

drivers/net/ethernet/wangxun/libwx/wx_hw.c
  3173cba117 ("net: libwx: fix races in Tx timestamp handling")
  7042c8c193 ("net: libwx: rename wx_pf_flags to wx_flags")

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

...

This commit is contained in:

Jakub Kicinski 2026-09-17 14:24:32 -07:00

parent 161ea2d4f2 f2c53ea949

commit 42a9fb3382

613 changed files with 10613 additions and 3212 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

.mailmap

View file

2

Documentation/ABI/testing/sysfs-devices-platform-trackpoint

View file

3

Documentation/admin-guide/kernel-parameters.txt

View file

1

Documentation/arch/arm64/booting.rst

View file

5

Documentation/arch/arm64/memory-tagging-extension.rst

View file

10

Documentation/bpf/kfuncs.rst

View file

6

Documentation/devicetree/bindings/display/msm/qcom,qcs8300-mdss.yaml

View file

4

Documentation/devicetree/bindings/display/msm/qcom,sar2130p-mdss.yaml

View file

14

Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml

View file

2

Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml

View file

60

Documentation/devicetree/bindings/display/msm/qcom,x1e80100-mdss.yaml

View file

1

Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml

View file

7

Documentation/devicetree/bindings/pinctrl/qcom,nord-tlmm.yaml

View file

42

Documentation/hwmon/cgbc-hwmon.rst

View file

2

Documentation/netlink/specs/netdev.yaml

View file

52

Documentation/trace/events-landlock.rst

View file

6

MAINTAINERS

View file

2

Makefile

View file

2

arch/arm/mach-socfpga/Kconfig

View file

0

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi Executable file →

View file

0

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts Executable file →

View file

2

arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-an400.dts

View file

113

arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts

View file

44

arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi

View file

1

arch/arm64/boot/dts/renesas/r8a779f0.dtsi

View file

10

arch/arm64/boot/dts/renesas/r9a09g047.dtsi

View file

10

arch/arm64/boot/dts/renesas/r9a09g056.dtsi

View file

10

arch/arm64/boot/dts/renesas/r9a09g057.dtsi

View file

27

arch/arm64/boot/dts/renesas/r9a09g077.dtsi

View file

27

arch/arm64/boot/dts/renesas/r9a09g087.dtsi

View file

9

arch/arm64/include/asm/el2_setup.h

View file

3

arch/arm64/include/asm/io.h

View file

20

arch/arm64/include/asm/percpu.h

View file

15

arch/arm64/kernel/cpu_errata.c

View file

2

arch/arm64/kernel/hibernate-asm.S

View file

4

arch/arm64/kernel/hibernate.c

View file

2

arch/arm64/kernel/mte.c

View file

2

arch/arm64/kernel/pi/idreg-override.c

View file

2

arch/arm64/net/bpf_jit_comp.c

View file

4

arch/mips/Kconfig

View file

4

arch/mips/cavium-octeon/octeon-platform.c

View file

264

arch/mips/configs/econet_en751221_defconfig

View file

2

arch/mips/net/bpf_jit_comp32.c

View file

3

arch/mips/net/bpf_jit_comp64.c

View file

18

arch/parisc/include/asm/compat_ucontext.h

View file

2

arch/parisc/include/asm/thread_info.h

View file

12

arch/parisc/kernel/setup.c

View file

33

arch/parisc/kernel/unwind.c

View file

5

arch/s390/crypto/hmac_s390.c

View file

11

arch/x86/Kconfig.cpu

View file

5

arch/x86/Makefile

View file

11

arch/x86/entry/entry_fred.c

View file

4

arch/x86/include/asm/text-patching.h

View file

6

arch/x86/kernel/alternative.c

View file

26

arch/x86/kernel/cpu/microcode/intel.c

View file

5

arch/x86/kernel/kprobes/core.c

View file

15

drivers/ata/libahci.c

View file

2

drivers/ata/libahci_platform.c

View file

7

drivers/ata/libata-scsi.c

View file

16

drivers/bluetooth/btintel_pcie.c

View file

8

drivers/bluetooth/btnxpuart.c

View file

11

drivers/clk/clk-scpi.c

View file

23

drivers/crypto/caam/jr.c

View file

2

drivers/dma-buf/Kconfig

View file

31

drivers/dma-buf/dma-buf-mapping.c

View file

14

drivers/dma-buf/dma-fence.c

View file

19

drivers/dma/dmaengine.c

View file

5

drivers/dma/mmp_pdma.c

View file

3

drivers/dma/pxa_dma.c

View file

3

drivers/dma/sprd-dma.c

View file

9

drivers/dma/sun6i-dma.c

View file

5

drivers/dma/ti/k3-udma-glue.c

View file

26

drivers/dma/xilinx/xilinx_dma.c

View file

3

drivers/dpll/dpll_netlink.c

View file

1

drivers/firmware/arm_ffa/driver.c

View file

2

drivers/firmware/arm_scmi/driver.c

View file

9

drivers/firmware/arm_scpi.c

View file

3

drivers/gpu/drm/amd/amdgpu/amdgpu.h

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

View file

54

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

View file

43

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

View file

2

drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c

View file

7

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

2

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c

View file

2

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c

View file

61

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c

View file

70

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c

View file

6

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c

View file

5

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c

View file

4

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

View file

12

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

View file

3

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c

View file

3

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

View file

64

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c

View file

28

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h

View file

16

drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c

View file

8

drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c

View file

34

drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c

View file

13

drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c

View file

6

drivers/gpu/drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.c

View file

Some files were not shown because too many files have changed in this diff Show more