Merge 4.10-rc3 into staging-next

Browse source

We want the IIO and staging driver fixes in here as well to handle merge
issues.

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

...

This commit is contained in:

Greg Kroah-Hartman 2017-01-09 07:58:34 +01:00

parent 9b9cefd00f a121103c92

commit 6c40045a5b

289 changed files with 2484 additions and 1674 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

13

Documentation/admin-guide/kernel-parameters.txt

View file

6

Documentation/block/queue-sysfs.txt

View file

4

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

View file

7

Documentation/devicetree/bindings/power/supply/tps65217_charger.txt

View file

15

Documentation/driver-api/infrastructure.rst

View file

4

Documentation/networking/mpls-sysctl.txt

View file

27

Documentation/vfio-mediated-device.txt

View file

22

MAINTAINERS

View file

2

Makefile

View file

3

arch/arm/Kconfig

View file

1

arch/arm/boot/dts/Makefile

View file

8

arch/arm/boot/dts/am335x-bone-common.dtsi

View file

1

arch/arm/boot/dts/am33xx.dtsi

View file

1

arch/arm/boot/dts/am4372.dtsi

View file

10

arch/arm/boot/dts/am571x-idk.dts

View file

14

arch/arm/boot/dts/am572x-idk.dts

View file

9

arch/arm/boot/dts/am57xx-idk-common.dtsi

View file

1

arch/arm/boot/dts/dm814x.dtsi

View file

1

arch/arm/boot/dts/dm816x.dtsi

View file

1

arch/arm/boot/dts/dra7.dtsi

View file

16

arch/arm/boot/dts/dra72-evm-tps65917.dtsi

View file

4

arch/arm/boot/dts/imx31.dtsi

View file

1

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi

View file

1

arch/arm/boot/dts/imx6qdl.dtsi

View file

1

arch/arm/boot/dts/imx6sl.dtsi

View file

1

arch/arm/boot/dts/imx6sx.dtsi

View file

1

arch/arm/boot/dts/omap2.dtsi

View file

2

arch/arm/boot/dts/omap3-n900.dts

View file

1

arch/arm/boot/dts/omap3.dtsi

View file

1

arch/arm/boot/dts/omap4.dtsi

View file

1

arch/arm/boot/dts/omap5.dtsi

View file

4

arch/arm/boot/dts/qcom-apq8064.dtsi

View file

2

arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts

View file

2

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

View file

3

arch/arm/boot/dts/vf610-zii-dev-rev-b.dts

View file

12

arch/arm/mach-davinci/clock.c

View file

2

arch/arm/mach-davinci/clock.h

View file

32

arch/arm/mach-davinci/da850.c

View file

34

arch/arm/mach-davinci/usb-da8xx.c

View file

31

arch/arm/mach-exynos/platsmp.c

View file

1

arch/arm/mach-imx/mach-imx1.c

View file

2

arch/arm/mach-omap2/Makefile

View file

2

arch/arm/mach-omap2/board-generic.c

View file

160

arch/arm/mach-omap2/gpio.c

View file

8

arch/arm/mach-omap2/omap_hwmod.c

View file

4

arch/arm/mach-omap2/omap_hwmod_common_data.h

View file

4

arch/arm/mach-omap2/prm_common.c

View file

9

arch/arm/mach-omap2/timer.c

View file

76

arch/arm/mach-s3c24xx/common.c

View file

16

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

View file

16

arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

View file

16

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

View file

4

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

View file

16

arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts

View file

6

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

View file

16

arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts

View file

4

arch/arm64/boot/dts/amlogic/meson-gxm.dtsi

View file

2

arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts

View file

10

arch/arm64/boot/dts/qcom/msm8996.dtsi

View file

2

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts

View file

1

arch/arm64/configs/defconfig

View file

10

arch/arm64/include/asm/current.h

View file

3

arch/arm64/mm/dma-mapping.c

View file

8

arch/arm64/mm/fault.c

View file

3

arch/arm64/mm/init.c

View file

5

arch/mips/kvm/entry.c

View file

4

arch/mips/kvm/mips.c

View file

2

arch/openrisc/kernel/vmlinux.lds.S

View file

1

arch/parisc/include/asm/thread_info.h

View file

23

arch/parisc/kernel/time.c

View file

2

arch/parisc/mm/fault.c

View file

8

arch/s390/include/asm/asm-prototypes.h

View file

8

arch/s390/kernel/vtime.c

View file

6

arch/x86/kernel/pci-swiotlb.c

View file

14

arch/x86/kvm/vmx.c

View file

9

arch/x86/kvm/x86.c

View file

2

arch/x86/xen/pci-swiotlb-xen.c

View file

6

arch/x86/xen/setup.c

View file

13

block/blk-wbt.c

View file

2

drivers/acpi/acpi_watchdog.c

View file

11

drivers/acpi/glue.c

View file

1

drivers/acpi/internal.h

View file

1

drivers/acpi/scan.c

View file

56

drivers/acpi/sysfs.c

View file

1

drivers/base/power/domain.c

View file

4

drivers/clk/clk-stm32f4.c

View file

27

drivers/clk/renesas/clk-mstp.c

View file

2

drivers/cpufreq/cpufreq-dt-platdev.c

View file

53

drivers/cpufreq/intel_pstate.c

View file

15

drivers/devfreq/devfreq.c

View file

2

drivers/devfreq/exynos-bus.c

View file

10

drivers/firmware/arm_scpi.c

View file

4

drivers/firmware/psci_checker.c

View file

4

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

View file

55

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

View file

4

drivers/gpu/drm/i915/gvt/gtt.h

View file

1

drivers/gpu/drm/i915/gvt/gvt.h

View file

66

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

View file

2

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

View file

33

drivers/gpu/drm/i915/i915_gem.c

View file

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