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

Browse source

Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

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

...

This commit is contained in:

Jakub Kicinski 2023-07-13 17:33:19 -07:00

parent ba2274dcfd b1983d427a

commit eb1b24a9bb

804 changed files with 19472 additions and 5681 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

7

.mailmap

View file

4

Documentation/ABI/obsolete/o2cb

View file

4

Documentation/ABI/removed/o2cb

View file

4

Documentation/ABI/stable/o2cb

View file

12

Documentation/ABI/testing/sysfs-ocfs2

View file

2

Documentation/admin-guide/acpi/ssdt-overlays.rst

View file

2

Documentation/admin-guide/kernel-parameters.txt

View file

36

Documentation/devicetree/bindings/dma/stericsson,dma40.yaml

View file

30

Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml

View file

6

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml

View file

4

Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml

View file

15

Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt

View file

36

Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.yaml

View file

6

Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml

View file

47

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

View file

128

Documentation/devicetree/bindings/phy/fsl,mxs-usbphy.yaml

View file

2

Documentation/devicetree/bindings/phy/intel,combo-phy.yaml

View file

9

Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.yaml

View file

33

Documentation/devicetree/bindings/phy/mxs-usb-phy.txt

View file

3

Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml

View file

2

Documentation/devicetree/bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml

View file

18

Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml

View file

27

Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml

View file

3

Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml

View file

55

Documentation/devicetree/bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml

View file

4

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml

View file

65

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml

View file

51

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml

View file

5

Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml

View file

1

Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml

View file

43

Documentation/devicetree/bindings/riscv/cpus.yaml

View file

250

Documentation/devicetree/bindings/riscv/extensions.yaml

View file

9

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

View file

21

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

View file

42

Documentation/devicetree/bindings/watchdog/loongson,ls1x-wdt.yaml

View file

50

Documentation/devicetree/bindings/watchdog/xlnx,versal-wwdt.yaml

View file

4

Documentation/driver-api/ntb.rst

View file

2

Documentation/filesystems/dlmfs.rst

View file

2

Documentation/filesystems/ocfs2.rst

View file

7

Documentation/process/6.Followthrough.rst

View file

2

Documentation/process/maintainer-netdev.rst

View file

10

Documentation/riscv/acpi.rst

View file

1

Documentation/riscv/index.rst

View file

8

Documentation/riscv/vector.rst

View file

6

Documentation/target/scripts.rst

View file

656

Documentation/target/tcm_mod_builder.py

View file

2

Documentation/translations/zh_CN/process/2.Process.rst

View file

2

Documentation/translations/zh_CN/process/3.Early-stage.rst

View file

2

Documentation/translations/zh_CN/process/4.Coding.rst

View file

2

Documentation/translations/zh_CN/process/7.AdvancedTopics.rst

View file

2

Documentation/translations/zh_TW/process/2.Process.rst

View file

2

Documentation/translations/zh_TW/process/3.Early-stage.rst

View file

2

Documentation/translations/zh_TW/process/4.Coding.rst

View file

2

Documentation/translations/zh_TW/process/7.AdvancedTopics.rst

View file

2

Documentation/virt/kvm/x86/amd-memory-encryption.rst

View file

3

Documentation/wmi/devices/dell-wmi-ddv.rst

View file

196

MAINTAINERS

View file

4

Makefile

View file

2

arch/arc/mm/init.c

View file

2

arch/arm/boot/dts/st/spear1310.dtsi

View file

2

arch/arm/boot/dts/st/spear1340.dtsi

View file

2

arch/arm/boot/dts/st/stih407-family.dtsi

View file

10

arch/arm/boot/dts/st/stih407-pinctrl.dtsi

View file

2

arch/arm/boot/dts/st/stm32f429-disco.dts

View file

2

arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi

View file

2

arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi

View file

6

arch/arm/boot/dts/st/stm32h7-pinctrl.dtsi

View file

4

arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi

View file

6

arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi

View file

6

arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi

View file

2

arch/arm/common/sharpsl_param.c

View file

2

arch/arm/include/asm/delay.h

View file

2

arch/arm/include/asm/io.h

View file

17

arch/arm/include/asm/memory.h

View file

4

arch/arm/include/asm/page.h

View file

2

arch/arm/include/asm/pgtable.h

View file

2

arch/arm/include/asm/proc-fns.h

View file

2

arch/arm/include/asm/sparsemem.h

View file

2

arch/arm/include/asm/uaccess-asm.h

View file

2

arch/arm/include/asm/uaccess.h

View file

2

arch/arm/kernel/asm-offsets.c

View file

2

arch/arm/kernel/entry-armv.S

View file

2

arch/arm/kernel/entry-common.S

View file

2

arch/arm/kernel/entry-v7m.S

View file

3

arch/arm/kernel/head-nommu.S

View file

2

arch/arm/kernel/head.S

View file

2

arch/arm/kernel/hibernate.c

View file

2

arch/arm/kernel/suspend.c

View file

2

arch/arm/kernel/tcm.c

View file

3

arch/arm/kernel/vmlinux-xip.lds.S

View file

3

arch/arm/kernel/vmlinux.lds.S

View file

2

arch/arm/mach-berlin/platsmp.c

View file

2

arch/arm/mach-keystone/keystone.c

View file

2

arch/arm/mach-omap2/sleep33xx.S

View file

2

arch/arm/mach-omap2/sleep43xx.S

View file

2

arch/arm/mach-omap2/sleep44xx.S

View file

2

arch/arm/mach-pxa/gumstix.c

View file

2

arch/arm/mach-rockchip/sleep.S

View file

2

arch/arm/mach-sa1100/pm.c

View file

2

arch/arm/mach-shmobile/headsmp-scu.S

View file

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