Merge branch 'ib-pdx86-properties'

Browse source

Merge branch 'ib-pdx86-properties' of
git://git.infradead.org/linux-platform-drivers-x86.git
to avoid conflicts in PDx86.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

...

This commit is contained in:

Andy Shevchenko 2020-04-20 18:34:20 +03:00

parent 97e130f637 c7582ff7ed

commit f7ea285b62

337 changed files with 3493 additions and 2327 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

47

Documentation/admin-guide/sysctl/kernel.rst

View file

6

Documentation/core-api/timekeeping.rst

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

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/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

2

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

2

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

View file

17

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

View file

2

Documentation/devicetree/bindings/rng/brcm,bcm2835.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

2

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

View file

76

Documentation/hwmon/isl68137.rst

View file

2

Documentation/networking/devlink/devlink-trap.rst

View file

1

Documentation/networking/index.rst

View file

2

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

11

MAINTAINERS

View file

2

Makefile

View file

3

arch/arm/boot/compressed/head.S

View file

6

arch/arm/boot/dts/imx6qdl.dtsi

View file

1

arch/arm/boot/dts/imx6qp.dtsi

View file

52

arch/arm/net/bpf_jit_32.c

View file

2

arch/arm/xen/enlighten.c

View file

4

arch/arm64/include/asm/sysreg.h

View file

13

arch/arm64/kernel/vdso.c

View file

1

arch/m68k/include/asm/Kbuild

View file

2

arch/riscv/Kconfig

View file

49

arch/riscv/net/bpf_jit_comp64.c

View file

6

arch/x86/hyperv/hv_init.c

View file

2

arch/x86/include/asm/efi.h

View file

2

arch/x86/include/asm/microcode_amd.h

View file

54

arch/x86/kernel/cpu/intel.c

View file

14

arch/x86/kernel/cpu/mshyperv.c

View file

2

arch/x86/kernel/cpu/resctrl/core.c

View file

1

arch/x86/kernel/cpu/resctrl/internal.h

View file

16

arch/x86/kernel/cpu/resctrl/rdtgroup.c

View file

2

arch/x86/kernel/umip.c

View file

16

arch/x86/platform/efi/efi_64.c

View file

4

block/blk-mq.c

View file

4

block/blk-wbt.c

View file

1

drivers/ata/ahci.c

View file

1

drivers/base/core.c

View file

48

drivers/base/swnode.c

View file

33

drivers/block/rbd.c

View file

2

drivers/clk/clk-asm9260.c

View file

33

drivers/clk/mmp/clk-pll.c

View file

31

drivers/clk/mmp/clk.c

View file

7

drivers/clk/mmp/clk.h

View file

3

drivers/clk/sprd/sc9863a-clk.c

View file

2

drivers/firmware/efi/cper.c

View file

2

drivers/firmware/efi/libstub/efistub.h

View file

27

drivers/firmware/efi/libstub/file.c

View file

18

drivers/firmware/efi/libstub/x86-stub.c

View file

22

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

View file

2

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

View file

2

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

View file

2

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

View file

4

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

View file

4

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

View file

2

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

View file

5

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

View file

6

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

View file

46

drivers/gpu/drm/i915/gvt/kvmgt.c

View file

65

drivers/gpu/drm/i915/i915_perf.c

View file

3

drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c

View file

16

drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c

View file

3

drivers/hv/channel_mgmt.c

View file

2

drivers/hv/hv_debugfs.c

View file

2

drivers/hv/hyperv_vmbus.h

View file

62

drivers/hv/vmbus_drv.c

View file

2

drivers/hwmon/Kconfig

View file

6

drivers/hwmon/drivetemp.c

View file

2

drivers/hwmon/jc42.c

View file

6

drivers/hwmon/k10temp.c

View file

92

drivers/hwmon/pmbus/isl68137.c

View file

9

drivers/i2c/busses/i2c-altera.c

View file

14

drivers/i2c/busses/i2c-designware-platdrv.c

View file

36

drivers/i2c/busses/i2c-tegra.c

View file

13

drivers/i2c/i2c-core-base.c

View file

2

drivers/irqchip/irq-bcm7038-l1.c

View file

20

drivers/irqchip/irq-gic-v3-its.c

View file

11

drivers/irqchip/irq-gic-v3.c

View file

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