Merge tag 'v4.9.62' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.9-stable
[email protected] Thu, 21 Dec 2017 17:22:35 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990793AbdLUQWiDSbcb/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:13:17 2017 +0100 Commit: 227c62558a7c4270b27cfcd6de199ac5623de9b0 Gitweb: https://git.linux-mips.org/g/ralf/linux/227c62558a7c Branch: linux-4.9-stable --- Documentation/devicetree/bindings/arm/davinci.txt | 4 + .../devicetree/bindings/clock/qoriq-clock.txt | 1 .../devicetree/bindings/vendor-prefixes.txt | 1 Makefile | 2 arch/arm/boot/dts/imx53-qsb-common.dtsi | 20 ++-- arch/arm/boot/dts/stih410.dtsi | 2 arch/arm/configs/omap2plus_defconfig | 1 arch/arm/kernel/traps.c | 28 ++++-- arch/arm64/mm/dma-mapping.c | 17 ++- arch/mips/ar7/platform.c | 5 + arch/mips/ar7/prom.c | 2 arch/mips/include/asm/mips-cm.h | 4 - arch/mips/kernel/process.c | 4 - arch/mips/kernel/smp-bmips.c | 4 - arch/mips/kernel/smp.c | 29 ++++-- arch/mips/mm/uasm-micromips.c | 2 arch/powerpc/boot/dts/fsl/kmcoge4.dts | 4 + arch/powerpc/kernel/time.c | 1 arch/powerpc/kvm/book3s_hv_rm_xics.c | 5 - arch/s390/kernel/early.c | 12 ++ arch/s390/kernel/topology.c | 11 -- arch/sh/kernel/cpu/sh3/setup-sh770x.c | 1 arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S | 12 +- .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 12 +- arch/x86/include/asm/uaccess.h | 13 ++- arch/x86/kernel/smpboot.c | 11 +- arch/x86/kernel/tsc.c | 8 +- arch/x86/oprofile/op_model_ppro.c | 4 - crypto/ccm.c | 4 + drivers/base/power/opp/of.c | 12 ++ drivers/block/rbd.c | 4 - drivers/clk/mvebu/ap806-system-controller.c | 28 +++++- drivers/clk/samsung/clk-exynos5433.c | 6 + drivers/crypto/vmx/aes_ctr.c | 6 + drivers/edac/amd64_edac.c | 12 ++ drivers/edac/amd64_edac.h | 1 drivers/gpu/drm/arm/malidp_planes.c | 3 - drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 36 ++++--- drivers/gpu/drm/drm_drv.c | 2 drivers/gpu/drm/i915/intel_drv.h | 1 drivers/gpu/drm/i915/intel_pm.c | 52 ++++------ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 drivers/iio/magnetometer/mag3110.c | 30 ++++-- drivers/iio/pressure/ms5611_core.c | 12 +- drivers/iio/proximity/sx9500.c | 10 +- drivers/iio/trigger/iio-trig-interrupt.c | 8 +- drivers/iio/trigger/iio-trig-sysfs.c | 2 drivers/infiniband/sw/rxe/rxe_req.c | 1 drivers/infiniband/sw/rxe/rxe_resp.c | 1 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 drivers/input/keyboard/mpr121_touchkey.c | 24 +++-- drivers/input/mouse/elan_i2c_core.c | 1 drivers/iommu/arm-smmu-v3.c | 10 -- drivers/media/i2c/adv7604.c | 3 + drivers/misc/cxl/pci.c | 3 + drivers/net/can/c_can/c_can_pci.c | 1 drivers/net/can/c_can/c_can_platform.c | 1 drivers/net/can/ifi_canfd/ifi_canfd.c | 6 + drivers/net/can/sun4i_can.c | 12 ++ drivers/net/usb/cdc_ncm.c | 28 ++++++ drivers/net/usb/huawei_cdc_ncm.c | 6 + drivers/net/wireless/ath/wcn36xx/main.c | 3 - .../broadcom/brcm80211/brcmfmac/cfg80211.c | 9 +- drivers/net/wireless/marvell/libertas/cmd.c | 2 drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 5 - drivers/net/xen-netback/netback.c | 6 + drivers/pci/host/pci-mvebu.c | 101 ++++++++++++-------- drivers/pinctrl/intel/pinctrl-baytrail.c | 2 drivers/platform/x86/hp-wmi.c | 60 +++++++----- drivers/s390/net/qeth_core.h | 1 drivers/s390/net/qeth_core_main.c | 21 +++- drivers/s390/net/qeth_l2_main.c | 15 --- drivers/s390/net/qeth_l3_main.c | 15 --- drivers/s390/net/qeth_l3_sys.c | 30 +++--- drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 - drivers/tty/serial/sh-sci.c | 17 ++- drivers/usb/core/hcd.c | 1 drivers/video/fbdev/pmag-ba-fb.c | 2 include/dt-bindings/clock/exynos5433.h | 5 + include/linux/phy.h | 8 -- include/linux/preempt.h | 21 +++- include/linux/usb/cdc_ncm.h | 1 include/sound/seq_kernel.h | 3 - kernel/sched/core.c | 1 kernel/workqueue_internal.h | 3 - lib/asn1_decoder.c | 4 - net/dsa/Kconfig | 5 + net/ipv4/ah4.c | 3 + net/netfilter/nft_meta.c | 28 +++++- security/apparmor/lsm.c | 2 security/keys/trusted.c | 71 +++++++------- sound/core/seq/oss/seq_oss_midi.c | 4 - sound/core/seq/oss/seq_oss_readq.c | 29 ++++++ sound/core/seq/oss/seq_oss_readq.h | 2 sound/soc/sunxi/sun4i-spdif.c | 8 -- tools/testing/selftests/firmware/fw_filesystem.sh | 6 + tools/testing/selftests/firmware/fw_userhelper.sh | 28 +++++- 97 files changed, 664 insertions(+), 412 deletions(-)