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

Browse source

Cross-merge networking fixes after downstream PR (net-6.13-rc2).

No conflicts or adjacent changes.

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

...

This commit is contained in:

Jakub Kicinski 2024-12-05 11:48:58 -08:00

parent da4fa00abe 896d8946da

commit 302cc446cb

3241 changed files with 71565 additions and 94142 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

1

.gitignore vendored

View file

64

Documentation/ABI/testing/configfs-usb-gadget-uvc

View file

15

Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu

View file

32

Documentation/ABI/testing/sysfs-bus-iio

View file

46

Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130

View file

27

Documentation/ABI/testing/sysfs-class-typec

View file

2

Documentation/ABI/testing/sysfs-class-watchdog

View file

7

Documentation/admin-guide/LSM/apparmor.rst

View file

2

Documentation/arch/arm64/silicon-errata.rst

View file

17

Documentation/arch/x86/boot.rst

View file

8

Documentation/core-api/symbol-namespaces.rst

View file

168

Documentation/dev-tools/autofdo.rst

View file

20

Documentation/dev-tools/coccinelle.rst

View file

2

Documentation/dev-tools/index.rst

View file

162

Documentation/dev-tools/propeller.rst

View file

46

Documentation/devicetree/bindings/connector/usb-connector.yaml

View file

4

Documentation/devicetree/bindings/iio/adc/adc.yaml

View file

3

Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml

View file

120

Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml

View file

199

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

View file

176

Documentation/devicetree/bindings/iio/adc/adi,ad7625.yaml

View file

110

Documentation/devicetree/bindings/iio/adc/adi,ad7779.yaml

View file

1

Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml

View file

86

Documentation/devicetree/bindings/iio/adc/gehc,pmc-adc.yaml

View file

9

Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml

View file

39

Documentation/devicetree/bindings/iio/dac/adi,ad5791.yaml

View file

164

Documentation/devicetree/bindings/iio/dac/adi,ad8460.yaml

View file

69

Documentation/devicetree/bindings/iio/dac/adi,axi-dac.yaml

View file

79

Documentation/devicetree/bindings/iio/imu/bosch,bmi270.yaml

View file

51

Documentation/devicetree/bindings/iio/imu/bosch,smi240.yaml

View file

2

Documentation/devicetree/bindings/iio/imu/invensense,icm42600.yaml

View file

7

Documentation/devicetree/bindings/iio/imu/invensense,mpu6050.yaml

View file

4

Documentation/devicetree/bindings/iio/light/ti,opt3001.yaml

View file

64

Documentation/devicetree/bindings/iio/light/veml6030.yaml

View file

107

Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml

View file

21

Documentation/devicetree/bindings/iio/light/vishay,veml6075.yaml

View file

46

Documentation/devicetree/bindings/iio/magnetometer/allegromicro,als31300.yaml

View file

22

Documentation/devicetree/bindings/iio/pressure/bmp085.yaml

View file

6

Documentation/devicetree/bindings/iio/temperature/ti,tmp006.yaml

View file

2

Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

View file

73

Documentation/devicetree/bindings/interconnect/qcom,qcs615-rpmh.yaml

View file

72

Documentation/devicetree/bindings/interconnect/qcom,qcs8300-rpmh.yaml

View file

117

Documentation/devicetree/bindings/interconnect/qcom,sar2130p-rpmh.yaml

View file

33

Documentation/devicetree/bindings/fuse/renesas,rcar-efuse.yaml → Documentation/devicetree/bindings/nvmem/renesas,rcar-efuse.yaml

View file

17

Documentation/devicetree/bindings/fuse/renesas,rcar-otp.yaml → Documentation/devicetree/bindings/nvmem/renesas,rcar-otp.yaml

View file

52

Documentation/devicetree/bindings/nvmem/sc27xx-efuse.txt

View file

68

Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml

View file

61

Documentation/devicetree/bindings/nvmem/sprd,ums312-efuse.yaml

View file

39

Documentation/devicetree/bindings/nvmem/sprd-efuse.txt

View file

40

Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.txt

View file

54

Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.yaml

View file

42

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

View file

2

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

View file

1

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

View file

28

Documentation/devicetree/bindings/riscv/extensions.yaml

View file

4

Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml

View file

63

Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml

View file

10

Documentation/devicetree/bindings/rtc/microchip,mfps-rtc.yaml → Documentation/devicetree/bindings/rtc/microchip,mpfs-rtc.yaml

View file

84

Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml

View file

19

Documentation/devicetree/bindings/serial/rs485.yaml

View file

14

Documentation/devicetree/bindings/serial/samsung_uart.yaml

View file

13

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

View file

1

Documentation/devicetree/bindings/serial/sprd-uart.yaml

View file

1

Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml

View file

6

Documentation/devicetree/bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml

View file

1

Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml

View file

5

Documentation/devicetree/bindings/usb/cypress,cypd4226.yaml

View file

6

Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml

View file

1

Documentation/devicetree/bindings/usb/generic-ehci.yaml

View file

1

Documentation/devicetree/bindings/usb/generic-ohci.yaml

View file

9

Documentation/devicetree/bindings/usb/genesys,gl850g.yaml

View file

1

Documentation/devicetree/bindings/usb/maxim,max33359.yaml

View file

7

Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml

View file

2

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

View file

4

Documentation/devicetree/bindings/usb/renesas,usbhs.yaml

View file

6

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

View file

49

Documentation/devicetree/bindings/usb/ti,tusb1046.yaml

View file

55

Documentation/devicetree/bindings/usb/ti,tusb73x0-pci.yaml

View file

4

Documentation/devicetree/bindings/vendor-prefixes.yaml

View file

47

Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml

View file

14

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml

View file

2

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

View file

3

Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml

View file

1

Documentation/driver-api/auxiliary_bus.rst

View file

16

Documentation/iio/ad7380.rst

View file

144

Documentation/iio/ad7606.rst

View file

91

Documentation/iio/ad7625.rst

View file

2

Documentation/iio/bno055.rst

View file

2

Documentation/iio/index.rst

View file

8

Documentation/kbuild/kbuild.rst

View file

4

Documentation/kbuild/kconfig-language.rst

View file

3

Documentation/kbuild/llvm.rst

View file

14

Documentation/kbuild/makefiles.rst

View file

29

Documentation/kbuild/modules.rst

View file

11

Documentation/networking/bareudp.rst

View file

2

Documentation/sound/hd-audio/notes.rst

View file

3

Documentation/sound/soc/dapm.rst

View file

4

Documentation/trace/ftrace.rst

View file

8

Documentation/translations/it_IT/core-api/symbol-namespaces.rst

View file

8

Documentation/translations/zh_CN/core-api/symbol-namespaces.rst

View file

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