Merge tag 'v4.9.84' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.9-stable
[email protected] Sat, 16 Jun 2018 06:27:18 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994726AbeFPE1WXyPfJ/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 21:49:19 2018 +0200 Commit: b92b51c9d65e8730abec0af9b4b2f47855fd8196 Gitweb: https://git.linux-mips.org/g/ralf/linux/b92b51c9d65e Branch: linux-4.9-stable --- Makefile | 8 + arch/arm/boot/dts/am4372.dtsi | 6 + arch/arm/boot/dts/am437x-cm-t43.dts | 4 - arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 - arch/arm/boot/dts/logicpd-som-lv.dtsi | 16 ++- arch/arm/boot/dts/omap4.dtsi | 4 - arch/arm/common/bL_switcher_dummy_if.c | 4 + arch/arm/mach-omap2/omap-secure.c | 19 +++ arch/arm/mach-omap2/omap-secure.h | 4 + arch/arm/mach-omap2/pm.h | 4 - arch/arm/mach-omap2/pm34xx.c | 13 +- arch/arm/mach-omap2/prm33xx.c | 12 -- arch/arm/mach-omap2/sleep34xx.S | 26 +---- arch/arm64/Kconfig | 2 arch/arm64/Kconfig.platforms | 2 arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 arch/arm64/crypto/crc32-arm64.c | 2 arch/arm64/include/asm/bug.h | 33 +++--- arch/arm64/mm/mmu.c | 2 arch/m68k/kernel/vmlinux-nommu.lds | 2 arch/m68k/kernel/vmlinux-std.lds | 2 arch/m68k/kernel/vmlinux-sun3.lds | 2 arch/powerpc/crypto/crc32c-vpmsum_glue.c | 1 arch/powerpc/include/asm/exception-64s.h | 2 arch/powerpc/include/asm/paca.h | 3 - arch/powerpc/kernel/asm-offsets.c | 3 - arch/powerpc/kernel/entry_64.S | 9 +- arch/powerpc/kernel/exceptions-64s.S | 99 +++++++++--------- arch/powerpc/kernel/idle_book3s.S | 7 + arch/powerpc/kernel/setup_64.c | 13 -- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 7 + arch/powerpc/kvm/book3s_rmhandlers.S | 7 + arch/powerpc/kvm/book3s_segment.S | 4 - arch/powerpc/perf/core-book3s.c | 4 - arch/s390/crypto/crc32-vx.c | 3 + arch/sparc/crypto/crc32c_glue.c | 1 arch/x86/Kconfig | 2 arch/x86/Kconfig.debug | 1 arch/x86/boot/Makefile | 5 + arch/x86/crypto/crc32-pclmul_glue.c | 1 arch/x86/crypto/crc32c-intel_glue.c | 1 arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 112 +++++++++++--------- arch/x86/events/core.c | 4 - arch/x86/include/asm/microcode_amd.h | 1 arch/x86/include/asm/vmx.h | 5 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 - arch/x86/kernel/cpu/microcode/amd.c | 17 ++- arch/x86/kernel/vm86_32.c | 5 + arch/x86/kvm/Kconfig | 3 - arch/x86/kvm/vmx.c | 36 ++++-- arch/x86/kvm/x86.c | 40 ++++++- arch/x86/math-emu/Makefile | 4 - arch/x86/math-emu/reg_compare.c | 16 +-- arch/x86/mm/ioremap.c | 4 - arch/x86/mm/kmmio.c | 12 +- block/blk-map.c | 4 - crypto/ahash.c | 22 +++- crypto/algif_hash.c | 52 ++------- crypto/crc32_generic.c | 1 crypto/crc32c_generic.c | 1 crypto/cryptd.c | 7 + crypto/mcryptd.c | 7 + crypto/shash.c | 25 ++++ drivers/Makefile | 1 drivers/android/binder.c | 2 drivers/block/rbd.c | 2 drivers/clk/meson/Kconfig | 1 drivers/clk/sunxi-ng/Kconfig | 1 drivers/crypto/bfin_crc.c | 3 - drivers/crypto/s5p-sss.c | 12 ++ drivers/crypto/talitos.c | 5 + drivers/dma/at_hdmac.c | 4 + drivers/dma/dma-jz4740.c | 4 + drivers/dma/ioat/init.c | 2 drivers/dma/zx296702_dma.c | 2 drivers/gpio/gpio-intel-mid.c | 2 drivers/gpio/gpio-xgene.c | 13 +- drivers/gpu/drm/armada/armada_crtc.c | 25 ++-- drivers/gpu/drm/drm_modeset_lock.c | 2 drivers/gpu/drm/exynos/exynos_hdmi.c | 6 - drivers/gpu/drm/i915/intel_drv.h | 2 drivers/gpu/drm/i915/intel_panel.c | 86 ++++++++------- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 drivers/idle/Kconfig | 1 drivers/infiniband/core/cma.c | 1 drivers/infiniband/hw/i40iw/i40iw_d.h | 2 drivers/input/keyboard/tca8418_keypad.c | 21 ++-- drivers/isdn/hardware/eicon/message.c | 16 +-- drivers/media/i2c/s5k6aa.c | 5 + drivers/media/i2c/tc358743.c | 46 ++++---- drivers/media/pci/tw5864/tw5864-video.c | 6 + drivers/media/usb/em28xx/Kconfig | 2 drivers/media/usb/go7007/Kconfig | 2 drivers/net/Kconfig | 3 + drivers/net/ethernet/arc/emac_rockchip.c | 7 + drivers/net/ethernet/freescale/gianfar.c | 11 ++ drivers/net/hippi/rrunner.c | 2 drivers/net/ipvlan/ipvlan_core.c | 1 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 drivers/net/wireless/st/cw1200/wsm.c | 8 + drivers/pci/host/vmd.c | 2 drivers/perf/xgene_pmu.c | 1 drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 2 drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 + drivers/platform/x86/dell-laptop.c | 17 +++ drivers/platform/x86/intel_mid_thermal.c | 2 drivers/s390/block/dasd_eckd.c | 16 ++- drivers/scsi/advansys.c | 24 ++-- drivers/spi/Kconfig | 1 drivers/spi/spi-sun4i.c | 2 drivers/staging/android/ashmem.c | 19 ++- drivers/staging/android/ion/ion-ioctl.c | 4 + drivers/staging/android/ion/ion_system_heap.c | 2 drivers/staging/iio/adc/ad7192.c | 27 +++-- drivers/staging/iio/impedance-analyzer/ad5933.c | 4 - .../lustre/lnet/libcfs/linux/linux-crypto-adler.c | 1 drivers/thermal/Kconfig | 4 - drivers/usb/dwc3/dwc3-of-simple.c | 4 + drivers/usb/dwc3/gadget.c | 2 drivers/usb/musb/musb_core.c | 2 drivers/usb/phy/Kconfig | 1 drivers/usb/usbip/stub_dev.c | 3 + drivers/usb/usbip/vhci_hcd.c | 2 drivers/vhost/vhost.c | 2 drivers/video/fbdev/mmp/core.c | 5 + drivers/video/fbdev/via/viafbdev.c | 8 + drivers/xen/Kconfig | 2 fs/btrfs/ioctl.c | 2 fs/compat_binfmt_elf.c | 2 fs/reiserfs/lbalance.c | 2 fs/reiserfs/reiserfs.h | 1 include/crypto/hash.h | 34 ++++-- include/linux/crypto.h | 8 + include/linux/pci-ecam.h | 2 include/linux/ptr_ring.h | 2 include/linux/string.h | 1 include/net/red.h | 13 ++ include/net/sctp/sctp.h | 3 - include/trace/events/clk.h | 4 - kernel/kcov.c | 4 - kernel/trace/blktrace.c | 32 ++++-- lib/Kconfig.debug | 1 lib/oid_registry.c | 8 + mm/early_ioremap.c | 2 mm/shmem.c | 6 + mm/util.c | 24 ++++ mm/vmscan.c | 3 + net/core/dev.c | 2 net/decnet/af_decnet.c | 62 ++++++----- net/ipv4/ip_sockglue.c | 14 +-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 ++- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 + net/ipv6/ipv6_sockglue.c | 17 +-- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 ++- net/kcm/kcmsock.c | 25 ++++ net/netfilter/x_tables.c | 10 +- net/netfilter/xt_RATEEST.c | 22 +++- net/netfilter/xt_cgroup.c | 1 net/rds/tcp.c | 9 +- net/rds/tcp.h | 1 net/sched/sch_choke.c | 3 + net/sched/sch_gred.c | 3 + net/sched/sch_red.c | 2 net/sched/sch_sfq.c | 3 + net/sctp/outqueue.c | 6 + net/sctp/socket.c | 29 +++-- net/wireless/core.c | 8 + net/xfrm/xfrm_policy.c | 11 ++ net/xfrm/xfrm_user.c | 24 ++++ scripts/kernel-doc | 2 security/keys/Kconfig | 1 security/selinux/ss/services.c | 21 ++-- sound/pci/hda/patch_ca0132.c | 3 + sound/soc/rockchip/rockchip_spdif.c | 18 ++- sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 + tools/build/Makefile.build | 10 ++ tools/perf/bench/numa.c | 56 +++++++++- tools/perf/builtin-top.c | 15 ++- tools/scripts/Makefile.include | 12 ++ 180 files changed, 1120 insertions(+), 679 deletions(-)