Merge 4.13-rc2 into staging-next

Browse source

This resolves a merge issue and gets the vmbox drm driver into this
branch to be able to start taking fixes for it...

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

...

This commit is contained in:

Greg Kroah-Hartman 2017-07-23 19:53:30 -07:00

parent 6f6752648a 520eccdfe1

commit a29e249072

450 changed files with 11814 additions and 4469 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

Documentation/devicetree/bindings/net/brcm,amac.txt

View file

24

Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt

View file

2

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

View file

15

Documentation/devicetree/bindings/ptp/brcm,ptp-dte.txt

View file

2

Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

View file

5106

MAINTAINERS

View file

File diff suppressed because it is too large Load diff

2

Makefile

View file

2

arch/alpha/include/uapi/asm/ioctls.h

View file

2

arch/arm/include/asm/bug.h

View file

2

arch/arm/include/asm/cacheflush.h

View file

2

arch/arm64/include/asm/bug.h

View file

4

arch/blackfin/include/asm/bug.h

View file

3

arch/blackfin/include/asm/flat.h

View file

4

arch/blackfin/kernel/flat.c

View file

2

arch/h8300/include/asm/flat.h

View file

3

arch/m68k/include/asm/flat.h

View file

2

arch/mips/include/uapi/asm/ioctls.h

View file

2

arch/mn10300/include/asm/bug.h

View file

6

arch/parisc/include/asm/bug.h

View file

2

arch/parisc/include/uapi/asm/ioctls.h

View file

1

arch/powerpc/include/asm/book3s/64/hash.h

View file

1

arch/powerpc/include/asm/book3s/64/pgtable.h

View file

1

arch/powerpc/include/asm/book3s/64/radix.h

View file

8

arch/powerpc/include/asm/bug.h

View file

7

arch/powerpc/include/asm/pgtable.h

View file

2

arch/powerpc/include/uapi/asm/ioctls.h

View file

28

arch/powerpc/kernel/exceptions-64s.S

View file

15

arch/powerpc/kernel/idle_book3s.S

View file

1

arch/powerpc/mm/mem.c

View file

44

arch/powerpc/mm/pgtable-hash64.c

View file

28

arch/powerpc/mm/pgtable-radix.c

View file

8

arch/powerpc/mm/pgtable_64.c

View file

2

arch/powerpc/platforms/powernv/opal.c

View file

4

arch/s390/include/asm/bug.h

View file

4

arch/sh/include/asm/bug.h

View file

2

arch/sh/include/uapi/asm/ioctls.h

View file

1

arch/sparc/include/asm/trap_block.h

View file

2

arch/sparc/include/uapi/asm/ioctls.h

View file

12

arch/sparc/kernel/pci_sun4v.c

View file

191

arch/sparc/kernel/smp_64.c

View file

15

arch/sparc/kernel/sun4v_ivec.S

View file

1

arch/sparc/kernel/traps_64.c

View file

1

arch/x86/Kconfig.debug

View file

5

arch/x86/boot/Makefile

View file

3

arch/x86/configs/i386_defconfig

View file

3

arch/x86/configs/x86_64_defconfig

View file

4

arch/x86/events/core.c

View file

164

arch/x86/events/intel/core.c

View file

26

arch/x86/events/intel/cstate.c

View file

22

arch/x86/events/intel/ds.c

View file

4

arch/x86/events/intel/lbr.c

View file

2

arch/x86/events/perf_event.h

View file

4

arch/x86/include/asm/bug.h

View file

4

arch/x86/include/asm/io.h

View file

8

arch/x86/include/asm/kprobes.h

View file

2

arch/x86/include/asm/mmu_context.h

View file

16

arch/x86/include/asm/paravirt_types.h

View file

2

arch/x86/include/asm/processor.h

View file

8

arch/x86/kernel/acpi/boot.c

View file

2

arch/x86/kernel/apic/io_apic.c

View file

1

arch/x86/kernel/cpu/amd.c

View file

3

arch/x86/kernel/devicetree.c

View file

2

arch/x86/kvm/Kconfig

View file

7

arch/x86/kvm/hyperv.c

View file

46

arch/x86/kvm/vmx.c

View file

4

arch/x86/kvm/x86.c

View file

4

arch/x86/math-emu/Makefile

View file

2

arch/x86/math-emu/fpu_emu.h

View file

16

arch/x86/math-emu/reg_compare.c

View file

6

arch/x86/platform/intel-mid/device_libs/platform_max7315.c

View file

29

arch/x86/platform/uv/tlb_uv.c

View file

3

arch/x86/xen/smp_pv.c

View file

1

arch/x86/xen/time.c

View file

2

arch/xtensa/include/uapi/asm/ioctls.h

View file

3

block/bfq-iosched.c

View file

2

block/bfq-iosched.h

View file

2

block/bfq-wf2q.c

View file

10

drivers/acpi/nfit/core.c

View file

17

drivers/android/binder.c

View file

2

drivers/atm/zatm.c

View file

8

drivers/base/power/domain.c

View file

4

drivers/base/regmap/regmap-w1.c

View file

2

drivers/block/nbd.c

View file

12

drivers/clocksource/timer-of.c

View file

21

drivers/cpufreq/intel_pstate.c

View file

2

drivers/dax/device-dax.h

View file

33

drivers/dax/device.c

View file

12

drivers/dax/pmem.c

View file

17

drivers/dma-buf/dma-fence.c

View file

2

drivers/dma-buf/sync_debug.c

View file

8

drivers/dma-buf/sync_file.c

View file

7

drivers/fsi/fsi-core.c

View file

3

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

View file

4

drivers/gpu/drm/amd/amdkfd/kfd_device.c

View file

7

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

1

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

View file

3

drivers/gpu/drm/amd/include/kgd_kfd_interface.h

View file

41

drivers/gpu/drm/drm_dp_mst_topology.c

View file

2

drivers/gpu/drm/imx/ipuv3-plane.c

View file

2

drivers/gpu/drm/imx/parallel-display.c

View file

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