Merge tag 'v4.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Mon, 08 Jan 2018 15:57:45 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994583AbeAHO5sINxv1/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jan 8 15:20:51 2018 +0100 Commit: 280b464e49e1293d885899021a2448bfcc03090d Gitweb: https://git.linux-mips.org/g/ralf/linux/280b464e49e1 Branch: master --- .mailmap | 1 Documentation/gpu/i915.rst | 5 - Documentation/x86/x86_64/mm.txt | 18 ++-- MAINTAINERS | 7 +- Makefile | 2 arch/arc/boot/dts/axc003.dtsi | 8 ++ arch/arc/boot/dts/axc003_idu.dtsi | 8 ++ arch/arc/boot/dts/hsdk.dts | 8 ++ arch/arc/configs/hsdk_defconfig | 5 + arch/arc/include/asm/uaccess.h | 5 + arch/arc/kernel/setup.c | 2 arch/arc/kernel/stacktrace.c | 2 arch/arc/kernel/traps.c | 14 +++ arch/arc/kernel/troubleshoot.c | 3 + arch/arc/plat-axs10x/axs10x.c | 18 ++-- arch/arc/plat-hsdk/platform.c | 42 --------- arch/arm/boot/dts/aspeed-g4.dtsi | 2 arch/arm/boot/dts/at91-tse850-3.dts | 1 arch/arm/boot/dts/da850-lego-ev3.dts | 4 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + arch/arm/boot/dts/ls1021a-qds.dts | 2 arch/arm/boot/dts/ls1021a-twr.dts | 2 arch/arm/boot/dts/rk3066a-marsboard.dts | 4 + arch/arm/boot/dts/rk3288.dtsi | 2 arch/arm/boot/dts/sun4i-a10.dtsi | 4 - arch/arm/boot/dts/sun5i-a10s.dtsi | 4 - arch/arm/boot/dts/sun6i-a31.dtsi | 4 - arch/arm/boot/dts/sun7i-a20.dtsi | 4 - arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 arch/arm/boot/dts/tango4-common.dtsi | 1 arch/arm/kernel/traps.c | 1 arch/arm/mach-davinci/dm365.c | 29 ++++--- .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 1 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 1 .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 3 - .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 11 -- .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 11 -- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 4 - arch/m32r/kernel/traps.c | 1 arch/parisc/include/asm/ldcw.h | 2 arch/parisc/kernel/drivers.c | 2 arch/parisc/kernel/entry.S | 13 ++- arch/parisc/kernel/pacache.S | 9 ++ arch/parisc/kernel/process.c | 39 +++++++++ arch/parisc/mm/init.c | 10 +- arch/powerpc/mm/fault.c | 7 +- arch/s390/kvm/kvm-s390.c | 9 +- arch/s390/kvm/priv.c | 2 arch/s390/lib/uaccess.c | 2 arch/s390/pci/pci_dma.c | 21 ++++- arch/s390/pci/pci_insn.c | 3 + arch/unicore32/kernel/traps.c | 1 arch/x86/entry/entry_64_compat.S | 13 +-- arch/x86/events/intel/ds.c | 16 ++++ arch/x86/include/asm/alternative.h | 4 - arch/x86/include/asm/cpufeatures.h | 2 arch/x86/include/asm/pgtable_64_types.h | 14 ++- arch/x86/include/asm/unwind.h | 17 +++- arch/x86/kernel/cpu/common.c | 4 - arch/x86/kernel/dumpstack.c | 31 +++++-- arch/x86/kernel/process.c | 2 arch/x86/kernel/setup.c | 5 - arch/x86/kernel/stacktrace.c | 2 arch/x86/kvm/svm.c | 19 ++++ arch/x86/kvm/vmx.c | 14 +++ arch/x86/mm/dump_pagetables.c | 2 arch/x86/mm/init.c | 2 arch/x86/mm/kaslr.c | 32 ++----- arch/x86/mm/pti.c | 9 +- arch/x86/platform/efi/quirks.c | 13 +++ crypto/af_alg.c | 4 - crypto/algif_aead.c | 2 crypto/algif_skcipher.c | 2 crypto/chacha20poly1305.c | 6 + crypto/pcrypt.c | 19 ++-- drivers/bus/sunxi-rsb.c | 1 drivers/crypto/chelsio/Kconfig | 1 drivers/crypto/inside-secure/safexcel.c | 1 drivers/crypto/inside-secure/safexcel_cipher.c | 85 +++++++++++++++---- drivers/crypto/inside-secure/safexcel_hash.c | 89 ++++++++++++++------ drivers/crypto/n2_core.c | 3 + drivers/firmware/efi/capsule-loader.c | 45 ++++++++-- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 6 - .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 drivers/gpu/drm/armada/armada_crtc.c | 47 ++++++----- drivers/gpu/drm/armada/armada_crtc.h | 2 drivers/gpu/drm/armada/armada_overlay.c | 38 ++++----- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/i915/intel_cdclk.c | 35 ++++++-- drivers/gpu/drm/i915/intel_display.c | 14 ++- drivers/gpu/drm/i915/intel_psr.c | 16 ++-- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 ++ drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 46 ++-------- drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 drivers/input/joystick/analog.c | 2 drivers/input/misc/ims-pcu.c | 2 drivers/input/misc/xen-kbdfront.c | 2 drivers/input/mouse/elantech.c | 2 drivers/input/touchscreen/elants_i2c.c | 10 ++ drivers/input/touchscreen/hideep.c | 3 - drivers/iommu/arm-smmu-v3.c | 17 +++- drivers/leds/led-core.c | 3 - drivers/mfd/rtsx_pcr.c | 3 + drivers/mtd/nand/pxa3xx_nand.c | 1 drivers/parisc/dino.c | 10 +- drivers/parisc/eisa_eeprom.c | 2 drivers/s390/block/dasd_3990_erp.c | 10 ++ drivers/s390/char/Makefile | 2 drivers/xen/pvcalls-front.c | 2 fs/afs/dir.c | 37 +++++++- fs/afs/inode.c | 4 + fs/afs/rxrpc.c | 2 fs/afs/write.c | 8 +- fs/btrfs/delayed-inode.c | 45 ++++++++-- fs/btrfs/volumes.c | 1 fs/exec.c | 9 ++ fs/super.c | 6 + fs/userfaultfd.c | 20 ++++ fs/xfs/xfs_aops.c | 4 - fs/xfs/xfs_iomap.c | 2 fs/xfs/xfs_qm.c | 46 +++++++--- include/crypto/if_alg.h | 5 + include/linux/bpf.h | 10 ++ include/linux/efi.h | 4 + include/linux/fscache.h | 2 kernel/acct.c | 2 kernel/bpf/inode.c | 40 +++++++++ kernel/bpf/syscall.c | 2 kernel/exit.c | 1 kernel/pid.c | 8 +- lib/mpi/longlong.h | 18 ++++ mm/debug.c | 28 +++--- mm/mprotect.c | 6 + mm/page_alloc.c | 2 mm/sparse.c | 2 mm/vmscan.c | 3 + mm/zsmalloc.c | 1 net/netfilter/xt_bpf.c | 14 --- security/Kconfig | 1 security/apparmor/mount.c | 12 ++- security/commoncap.c | 21 ++--- 149 files changed, 994 insertions(+), 507 deletions(-)