Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Sun, 01 Jul 2018 11:04:57 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990403AbeGAJE71z6qV/[email protected]> |
Author: Ralf Baechle <[email protected]> Sun Jul 1 11:03:40 2018 +0200 Commit: beccd7a516e1352b2d0a0dabfd7fe0dcd22d081c Gitweb: https://git.linux-mips.org/g/ralf/linux/beccd7a516e1 Branch: master --- Documentation/kbuild/kconfig-language.txt | 6 + arch/arm/boot/dts/da850.dtsi | 6 - arch/arm/mach-davinci/board-da850-evm.c | 2 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 15 +++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 12 ++ arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 2 .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 - .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 7 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 -- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 2 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 arch/parisc/Kconfig | 6 + arch/parisc/Makefile | 4 - arch/parisc/include/asm/signal.h | 8 -- arch/parisc/include/uapi/asm/unistd.h | 3 - arch/parisc/kernel/drivers.c | 25 ++--- arch/parisc/kernel/syscall_table.S | 1 arch/parisc/kernel/unwind.c | 4 - arch/powerpc/kernel/pci_32.c | 4 - arch/powerpc/kernel/pci_64.c | 4 - arch/powerpc/kernel/rtas.c | 4 - arch/powerpc/kernel/signal_32.c | 8 -- arch/powerpc/kernel/signal_64.c | 4 - arch/powerpc/kernel/syscalls.c | 4 - arch/powerpc/mm/subpage-prot.c | 4 - arch/x86/entry/entry_32.S | 2 arch/x86/entry/entry_64_compat.S | 16 ++- arch/x86/include/asm/pgalloc.h | 3 + arch/x86/include/asm/pgtable.h | 2 arch/x86/include/asm/pgtable_64.h | 4 - arch/x86/mm/fault.c | 21 +--- arch/x86/platform/efi/efi_64.c | 4 - block/blk-core.c | 4 + block/blk-mq.c | 12 ++ drivers/block/drbd/drbd_req.c | 4 - drivers/gpu/drm/i915/i915_drv.h | 3 - drivers/nvme/host/rdma.c | 7 + include/linux/blkdev.h | 4 - include/linux/compat.h | 8 +- include/linux/compiler-gcc.h | 25 +++++ include/linux/compiler_types.h | 18 ++++ include/linux/scatterlist.h | 18 ---- include/linux/syscalls.h | 4 + init/Kconfig | 7 + kernel/events/core.c | 2 lib/scatterlist.c | 6 - scripts/gcc-x86_64-has-stack-protector.sh | 2 scripts/kconfig/expr.h | 3 + scripts/kconfig/preprocess.c | 2 scripts/kconfig/zconf.y | 8 +- security/selinux/selinuxfs.c | 78 +++++++--------- tools/arch/arm/include/uapi/asm/kvm.h | 1 tools/arch/arm64/include/uapi/asm/kvm.h | 1 tools/arch/powerpc/include/uapi/asm/kvm.h | 1 tools/arch/powerpc/include/uapi/asm/unistd.h | 1 tools/arch/x86/include/asm/cpufeatures.h | 2 tools/include/uapi/drm/drm.h | 7 + tools/include/uapi/linux/bpf.h | 2 tools/include/uapi/linux/if_link.h | 2 tools/include/uapi/linux/kvm.h | 1 tools/perf/arch/powerpc/util/skip-callchain-idx.c | 2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 tools/perf/bench/numa.c | 5 + tools/perf/builtin-annotate.c | 11 ++ tools/perf/builtin-report.c | 3 - tools/perf/builtin-script.c | 30 +++++- tools/perf/tests/parse-events.c | 25 ++++- tools/perf/tests/topology.c | 1 tools/perf/util/c++/clang.cpp | 11 ++ tools/perf/util/header.c | 12 ++ .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 tools/perf/util/pmu.c | 99 ++++++++++++++++++++ tools/testing/selftests/x86/sigreturn.c | 59 +++++++----- tools/virtio/linux/scatterlist.h | 18 ---- 75 files changed, 449 insertions(+), 268 deletions(-)