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

Browse source

Minor overlapping changes, nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2020-03-12 21:29:30 -07:00

parent a8eceea84a 0d81a3f29c

commit 1d34357931

583 changed files with 5395 additions and 2808 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

25

.clang-format

View file

4

.gitignore vendored

View file

4

Documentation/admin-guide/acpi/fan_performance_states.rst

View file

4

Documentation/admin-guide/kernel-parameters.txt

View file

2

Documentation/devicetree/bindings/arm/arm,scmi.txt

View file

2

Documentation/devicetree/bindings/arm/arm,scpi.txt

View file

2

Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt

View file

2

Documentation/devicetree/bindings/arm/cpus.yaml

View file

2

Documentation/devicetree/bindings/arm/fsl.yaml

View file

2

Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt

View file

2

Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt

View file

2

Documentation/devicetree/bindings/arm/omap/mpu.txt

View file

36

Documentation/devicetree/bindings/arm/psci.yaml

View file

2

Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml

View file

1

Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml

View file

2

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-osc-clk.yaml

View file

2

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-gt-clk.yaml

View file

2

Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml

View file

6

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tv-encoder.yaml

View file

10

Documentation/devicetree/bindings/display/bridge/anx6345.yaml

View file

2

Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml

View file

2

Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml

View file

6

Documentation/devicetree/bindings/display/simple-framebuffer.yaml

View file

2

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

View file

14

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

View file

14

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

View file

14

Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml

View file

2

Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml

View file

2

Documentation/devicetree/bindings/input/touchscreen/goodix.yaml

View file

2

Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt

View file

2

Documentation/devicetree/bindings/leds/common.yaml

View file

2

Documentation/devicetree/bindings/leds/register-bit-led.txt

View file

2

Documentation/devicetree/bindings/media/ti,cal.yaml

View file

2

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

View file

4

Documentation/devicetree/bindings/mfd/max77650.yaml

View file

4

Documentation/devicetree/bindings/mfd/tps65910.txt

View file

0

Documentation/devicetree/bindings/mfd/twl-familly.txt → Documentation/devicetree/bindings/mfd/twl-family.txt

View file

2

Documentation/devicetree/bindings/mfd/zii,rave-sp.txt

View file

2

Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt

View file

1

Documentation/devicetree/bindings/mmc/mmc-controller.yaml

View file

2

Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt

View file

2

Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt

View file

7

Documentation/devicetree/bindings/net/fsl-fman.txt

View file

2

Documentation/devicetree/bindings/nvmem/nvmem.yaml

View file

2

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

View file

2

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml

View file

2

Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml

View file

2

Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml

View file

2

Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml

View file

2

Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml

View file

33

Documentation/devicetree/bindings/power/domain-idle-state.txt

View file

64

Documentation/devicetree/bindings/power/domain-idle-state.yaml

View file

24

Documentation/devicetree/bindings/power/power-domain.yaml

View file

2

Documentation/devicetree/bindings/power/power_domain.txt

View file

2

Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt

View file

2

Documentation/devicetree/bindings/regulator/regulator.yaml

View file

6

Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml

View file

2

Documentation/devicetree/bindings/reset/st,stm32mp1-rcc.txt

View file

2

Documentation/devicetree/bindings/sound/st,stm32-sai.txt

View file

2

Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt

View file

2

Documentation/devicetree/bindings/spi/st,stm32-spi.yaml

View file

2

Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml

View file

2

Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml

View file

2

Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml

View file

14

Documentation/driver-api/dmaengine/client.rst

View file

6

Documentation/filesystems/debugfs.txt

View file

8

Documentation/filesystems/porting.rst

View file

3

Documentation/hwmon/adm1177.rst

View file

3

Documentation/networking/devlink/devlink-region.rst

View file

6

Documentation/networking/net_failover.rst

View file

2

Documentation/networking/rds.txt

View file

1

Documentation/power/index.rst

View file

29

MAINTAINERS

View file

2

Makefile

View file

5

arch/Kconfig

View file

4

arch/arm/boot/dts/am437x-idk-evm.dts

View file

3

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

View file

2

arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts

View file

2

arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

View file

4

arch/arm/boot/dts/dra7-evm.dts

View file

4

arch/arm/boot/dts/dra7-l4.dtsi

View file

2

arch/arm/boot/dts/dra7.dtsi

View file

5

arch/arm/boot/dts/dra76x.dtsi

View file

12

arch/arm/boot/dts/dra7xx-clocks.dtsi

View file

4

arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts

View file

1

arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi

View file

1

arch/arm/boot/dts/imx7-colibri.dtsi

View file

6

arch/arm/boot/dts/imx7d.dtsi

View file

4

arch/arm/boot/dts/ls1021a.dtsi

View file

13

arch/arm/boot/dts/motorola-mapphone-common.dtsi

View file

2

arch/arm/boot/dts/r8a7779.dtsi

View file

1

arch/arm/configs/bcm2835_defconfig

View file

1

arch/arm/configs/omap2plus_defconfig

View file

1

arch/arm/configs/socfpga_defconfig

View file

3

arch/arm/include/asm/kvm_host.h

View file

2

arch/arm/mach-imx/Makefile

View file

4

arch/arm/mach-imx/common.h

View file

24

arch/arm/mach-imx/resume-imx6.S

View file

14

arch/arm/mach-imx/suspend-imx6.S

View file

1

arch/arm/mach-meson/Kconfig

View file

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