Merge 5.0-rc2 into staging-next

Browse source

We want the staging driver fixes in here as well.

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

...

This commit is contained in:

Greg Kroah-Hartman 2019-01-15 15:25:58 +01:00

parent 4b03f3f4cc 1c7fc5cbc3

commit 90c5f2d29f

484 changed files with 4287 additions and 2817 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

9

Documentation/ABI/testing/sysfs-block

View file

11

Documentation/ABI/testing/sysfs-block-zram

View file

7

Documentation/block/bfq-iosched.txt

View file

3

Documentation/block/null_blk.txt

View file

7

Documentation/block/queue-sysfs.txt

View file

74

Documentation/blockdev/zram.txt

View file

3

Documentation/devicetree/bindings/reset/socfpga-reset.txt

View file

25

Documentation/devicetree/bindings/reset/uniphier-reset.txt

View file

8

Documentation/driver-model/bus.txt

View file

1

Documentation/features/core/cBPF-JIT/arch-support.txt

View file

1

Documentation/features/core/eBPF-JIT/arch-support.txt

View file

1

Documentation/features/core/generic-idle-thread/arch-support.txt

View file

1

Documentation/features/core/jump-labels/arch-support.txt

View file

1

Documentation/features/core/tracehook/arch-support.txt

View file

1

Documentation/features/debug/KASAN/arch-support.txt

View file

1

Documentation/features/debug/gcov-profile-all/arch-support.txt

View file

1

Documentation/features/debug/kgdb/arch-support.txt

View file

1

Documentation/features/debug/kprobes-on-ftrace/arch-support.txt

View file

1

Documentation/features/debug/kprobes/arch-support.txt

View file

1

Documentation/features/debug/kretprobes/arch-support.txt

View file

1

Documentation/features/debug/optprobes/arch-support.txt

View file

1

Documentation/features/debug/stackprotector/arch-support.txt

View file

1

Documentation/features/debug/uprobes/arch-support.txt

View file

1

Documentation/features/debug/user-ret-profiler/arch-support.txt

View file

1

Documentation/features/io/dma-contiguous/arch-support.txt

View file

1

Documentation/features/locking/cmpxchg-local/arch-support.txt

View file

1

Documentation/features/locking/lockdep/arch-support.txt

View file

1

Documentation/features/locking/queued-rwlocks/arch-support.txt

View file

1

Documentation/features/locking/queued-spinlocks/arch-support.txt

View file

1

Documentation/features/locking/rwsem-optimized/arch-support.txt

View file

1

Documentation/features/perf/kprobes-event/arch-support.txt

View file

1

Documentation/features/perf/perf-regs/arch-support.txt

View file

1

Documentation/features/perf/perf-stackdump/arch-support.txt

View file

1

Documentation/features/sched/membarrier-sync-core/arch-support.txt

View file

1

Documentation/features/sched/numa-balancing/arch-support.txt

View file

1

Documentation/features/seccomp/seccomp-filter/arch-support.txt

View file

1

Documentation/features/time/arch-tick-broadcast/arch-support.txt

View file

1

Documentation/features/time/clockevents/arch-support.txt

View file

1

Documentation/features/time/context-tracking/arch-support.txt

View file

1

Documentation/features/time/irq-time-acct/arch-support.txt

View file

1

Documentation/features/time/modern-timekeeping/arch-support.txt

View file

1

Documentation/features/time/virt-cpuacct/arch-support.txt

View file

1

Documentation/features/vm/ELF-ASLR/arch-support.txt

View file

1

Documentation/features/vm/PG_uncached/arch-support.txt

View file

1

Documentation/features/vm/THP/arch-support.txt

View file

1

Documentation/features/vm/TLB/arch-support.txt

View file

1

Documentation/features/vm/huge-vmap/arch-support.txt

View file

1

Documentation/features/vm/ioremap_prot/arch-support.txt

View file

1

Documentation/features/vm/numa-memblock/arch-support.txt

View file

1

Documentation/features/vm/pte_special/arch-support.txt

View file

4

Documentation/filesystems/sysfs.txt

View file

2

Documentation/trace/coresight-cpu-debug.txt

View file

2

Documentation/virtual/kvm/amd-memory-encryption.rst

View file

2

Documentation/x86/resctrl_ui.txt

View file

16

MAINTAINERS

View file

2

Makefile

View file

31

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

View file

38

arch/arm/boot/dts/da850-lcdk.dts

View file

4

arch/arm/boot/dts/kirkwood-dnskw.dtsi

View file

4

arch/arm/mach-davinci/board-da830-evm.c

View file

4

arch/arm/mach-davinci/board-da850-evm.c

View file

4

arch/arm/mach-davinci/board-dm355-evm.c

View file

4

arch/arm/mach-davinci/board-dm644x-evm.c

View file

4

arch/arm/mach-davinci/board-omapl138-hawk.c

View file

8

arch/arm/mach-integrator/impd1.c

View file

4

arch/arm/mach-socfpga/socfpga.c

View file

2

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

View file

17

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

View file

4

arch/arm64/configs/defconfig

View file

2

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

View file

6

arch/arm64/include/asm/cache.h

View file

41

arch/arm64/include/asm/mmu.h

View file

4

arch/arm64/include/asm/pgtable-prot.h

View file

2

arch/arm64/kernel/cpu_errata.c

View file

9

arch/arm64/kernel/cpufeature.c

View file

1

arch/arm64/kernel/head.S

View file

4

arch/arm64/kernel/machine_kexec_file.c

View file

1

arch/c6x/include/uapi/asm/Kbuild

View file

25

arch/csky/include/asm/io.h

View file

41

arch/csky/include/asm/pgalloc.h

View file

38

arch/csky/kernel/module.c

View file

1

arch/h8300/include/uapi/asm/Kbuild

View file

1

arch/hexagon/include/uapi/asm/Kbuild

View file

1

arch/m68k/include/uapi/asm/Kbuild

View file

1

arch/microblaze/include/uapi/asm/Kbuild

View file

6

arch/mips/lantiq/xway/dma.c

View file

8

arch/openrisc/include/asm/uaccess.h

View file

1

arch/openrisc/include/uapi/asm/Kbuild

View file

2

arch/powerpc/platforms/pasemi/dma_lib.c

View file

7

arch/powerpc/sysdev/fsl_rmu.c

View file

4

arch/riscv/Kconfig

View file

28

arch/riscv/include/asm/module.h

View file

5

arch/riscv/include/asm/ptrace.h

View file

10

arch/riscv/include/asm/syscall.h

View file

6

arch/riscv/include/asm/thread_info.h

View file

2

arch/riscv/include/asm/unistd.h

View file

4

arch/riscv/kernel/entry.S

View file

30

arch/riscv/kernel/module-sections.c

View file

9

arch/riscv/kernel/ptrace.c

View file

9

arch/riscv/kernel/setup.c

View file

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