Merge 5.7-rc3 into staging-next

Browse source

We need the staging fixes in here too, and this resolves a merge issue
with the vt6656 driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2020-04-27 12:20:40 +02:00

parent 41aef04524 6a8b55ed40

commit e8014d83f6

772 changed files with 8206 additions and 4844 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

18

.clang-format

View file

3

Documentation/admin-guide/kernel-parameters.txt

View file

47

Documentation/admin-guide/sysctl/kernel.rst

View file

47

Documentation/arm64/amu.rst

View file

6

Documentation/core-api/timekeeping.rst

View file

23

Documentation/devicetree/bindings/Makefile

View file

6

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml

View file

2

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

View file

4

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

View file

4

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

View file

1

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

View file

10

Documentation/devicetree/bindings/display/panel/lvds.yaml

View file

1

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

View file

2

Documentation/devicetree/bindings/dma/adi,axi-dmac.txt

View file

4

Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml

View file

2

Documentation/devicetree/bindings/hwmon/adt7475.yaml

View file

2

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml

View file

2

Documentation/devicetree/bindings/iio/dac/ad5755.txt

View file

97

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

View file

2

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

View file

5

Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml

View file

41

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

View file

4

Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml

View file

4

Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.yaml

View file

4

Documentation/devicetree/bindings/mfd/st,stpmic1.yaml

View file

3

Documentation/devicetree/bindings/net/ethernet-phy.yaml

View file

2

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

View file

1

Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml

View file

2

Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt

View file

6

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

View file

2

Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml

View file

17

Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.yaml

View file

1

Documentation/devicetree/bindings/regulator/mps,mp5416.yaml

View file

3

Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml

View file

6

Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml

View file

6

Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml

View file

6

Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml

View file

2

Documentation/devicetree/bindings/rng/brcm,bcm2835.yaml

View file

3

Documentation/devicetree/bindings/sound/rockchip-i2s.yaml

View file

45

Documentation/devicetree/bindings/sound/rockchip-spdif.txt

View file

101

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

View file

2

Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml

View file

2

Documentation/devicetree/bindings/usb/ingenic,musb.yaml

View file

4

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

View file

1

Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml

View file

1

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

View file

2

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

View file

3

Documentation/devicetree/bindings/usb/usb-xhci.txt

View file

4

Documentation/filesystems/debugfs.rst

View file

76

Documentation/hwmon/isl68137.rst

View file

3

Documentation/kbuild/makefiles.rst

View file

2

Documentation/networking/devlink/devlink-trap.rst

View file

1

Documentation/networking/index.rst

View file

9

Documentation/networking/ip-sysctl.txt

View file

96

Documentation/networking/net_dim.txt → Documentation/networking/net_dim.rst

View file

21

Documentation/x86/boot.rst

View file

81

MAINTAINERS

View file

2

Makefile

View file

5

arch/arc/include/asm/module.h

View file

8

arch/arc/include/asm/vermagic.h

View file

3

arch/arm/boot/compressed/head.S

View file

3

arch/arm/boot/dts/bcm2835-rpi.dtsi

View file

1

arch/arm/boot/dts/bcm283x.dtsi

View file

6

arch/arm/boot/dts/imx6qdl.dtsi

View file

1

arch/arm/boot/dts/imx6qp.dtsi

View file

5

arch/arm/boot/dts/omap3-n950-n9.dtsi

View file

24

arch/arm/include/asm/module.h

View file

31

arch/arm/include/asm/vermagic.h

View file

2

arch/arm/mach-imx/Makefile

View file

52

arch/arm/net/bpf_jit_32.c

View file

2

arch/arm/xen/enlighten.c

View file

2

arch/arm64/include/asm/module.h

View file

9

arch/arm64/include/asm/pointer_auth.h

View file

4

arch/arm64/include/asm/sysreg.h

View file

10

arch/arm64/include/asm/vermagic.h

View file

13

arch/arm64/kernel/vdso.c

View file

2

arch/h8300/kernel/.gitignore vendored

View file

8

arch/hexagon/include/asm/module.h → arch/hexagon/include/asm/vermagic.h

View file

4

arch/ia64/include/asm/module.h

View file

15

arch/ia64/include/asm/vermagic.h

View file

1

arch/m68k/include/asm/Kbuild

View file

61

arch/mips/include/asm/module.h

View file

66

arch/mips/include/asm/vermagic.h

View file

8

arch/nds32/include/asm/module.h → arch/nds32/include/asm/vermagic.h

View file

18

arch/powerpc/include/asm/module.h

View file

20

arch/powerpc/include/asm/vermagic.h

View file

2

arch/powerpc/kernel/entry_32.S

View file

2

arch/powerpc/kernel/setup_64.c

View file

9

arch/powerpc/kvm/book3s_64_mmu_hv.c

View file

9

arch/powerpc/kvm/book3s_64_mmu_radix.c

View file

3

arch/powerpc/mm/nohash/8xx.c

View file

2

arch/powerpc/platforms/Kconfig.cputype

View file

2

arch/riscv/Kconfig

View file

2

arch/riscv/include/asm/module.h

View file

9

arch/riscv/include/asm/vermagic.h

View file

49

arch/riscv/net/bpf_jit_comp64.c

View file

2

arch/s390/boot/uv.c

View file

2

arch/s390/kernel/diag.c

View file

4

arch/s390/kernel/smp.c

View file

2

arch/s390/kernel/trace.c

View file

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