Merge tag 'v4.4.98' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.4-stable
[email protected] Thu, 21 Dec 2017 17:32:31 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994671AbdLUQce3M7ZE/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:18:51 2017 +0100 Commit: 926476cdcd6b5cfd83afc18135b4996e76ec45d0 Gitweb: https://git.linux-mips.org/g/ralf/linux/926476cdcd6b Branch: linux-4.4-stable --- Makefile | 2 arch/arm/configs/omap2plus_defconfig | 1 arch/arm/kernel/traps.c | 28 ++++-- 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.c | 29 ++++-- arch/mips/mm/uasm-micromips.c | 2 arch/powerpc/boot/dts/fsl/kmcoge4.dts | 4 + arch/powerpc/kvm/book3s_hv_rm_xics.c | 5 - arch/sh/kernel/cpu/sh3/setup-sh770x.c | 1 arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 12 +- arch/x86/include/asm/uaccess.h | 14 ++- arch/x86/oprofile/op_model_ppro.c | 4 - crypto/asymmetric_keys/pkcs7_parser.c | 2 drivers/block/rbd.c | 4 - drivers/crypto/vmx/aes_ctr.c | 6 + drivers/gpu/drm/drm_drv.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 drivers/iio/trigger/iio-trig-interrupt.c | 8 +- drivers/iio/trigger/iio-trig-sysfs.c | 2 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/net/can/c_can/c_can_pci.c | 1 drivers/net/can/c_can/c_can_platform.c | 1 drivers/net/can/sun4i_can.c | 12 ++ drivers/net/usb/cdc_ncm.c | 28 ++++++ drivers/net/usb/huawei_cdc_ncm.c | 6 + drivers/net/xen-netback/netback.c | 6 + drivers/pci/host/pci-mvebu.c | 101 ++++++++++++--------- 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/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/linux/phy.h | 8 -- include/linux/preempt.h | 21 +++- include/linux/usb/cdc_ncm.h | 1 include/sound/seq_kernel.h | 3 - kernel/workqueue_internal.h | 3 - lib/asn1_decoder.c | 4 - lib/test_firmware.c | 11 ++ net/dsa/Kconfig | 5 + net/ipv4/ah4.c | 3 + net/netfilter/nft_meta.c | 28 ++++++ 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 tools/testing/selftests/firmware/fw_filesystem.sh | 10 ++ tools/testing/selftests/firmware/fw_userhelper.sh | 28 +++++- 59 files changed, 451 insertions(+), 254 deletions(-)