Merge tag 'v4.1.47' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
[email protected] Thu, 21 Dec 2017 17:38:51 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994673AbdLUQixjsISE/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:22:41 2017 +0100 Commit: 0884daa2fff185306346a1732a0467affadc023a Gitweb: https://git.linux-mips.org/g/ralf/linux/0884daa2fff1 Branch: linux-4.1-stable --- Makefile | 2 arch/arm/configs/omap2plus_defconfig | 1 arch/arm/include/asm/Kbuild | 1 arch/arm/include/asm/unaligned.h | 27 +++++ arch/arm/kernel/traps.c | 28 ++++-- arch/arm/mach-omap2/pdata-quirks.c | 1 arch/arm/mach-pxa/balloon3.c | 1 arch/arm/mach-pxa/colibri-pxa270-income.c | 1 arch/arm/mach-pxa/corgi.c | 1 arch/arm/mach-pxa/trizeps4.c | 1 arch/arm/mach-pxa/vpac270.c | 1 arch/arm/mach-pxa/zeus.c | 1 arch/arm/mach-pxa/zylonite.c | 1 arch/arm/xen/mm.c | 1 arch/arm64/kernel/traps.c | 2 arch/mips/ar7/platform.c | 5 + arch/mips/ar7/prom.c | 2 arch/mips/include/asm/asm.h | 10 +- arch/mips/include/asm/mips-cm.h | 4 - arch/mips/kernel/process.c | 4 - arch/mips/kernel/setup.c | 78 +++++++++++++++ arch/mips/kernel/smp.c | 29 ++++-- arch/mips/mm/uasm-micromips.c | 2 arch/mips/netlogic/common/irq.c | 4 - arch/powerpc/Kconfig | 5 - arch/powerpc/kvm/book3s_hv_rm_xics.c | 5 - arch/s390/Kconfig | 3 - arch/sh/kernel/cpu/sh3/setup-sh770x.c | 1 arch/sparc/Kconfig | 3 - arch/x86/Kconfig | 4 - arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 12 +- arch/x86/include/asm/kvm_emulate.h | 1 arch/x86/kvm/emulate.c | 1 arch/x86/kvm/x86.c | 52 ++++------ arch/x86/oprofile/op_model_ppro.c | 4 - drivers/ata/Kconfig | 3 + drivers/block/rbd.c | 4 - drivers/block/xen-blkback/blkback.c | 23 ++--- drivers/block/xen-blkback/common.h | 25 +---- drivers/char/ipmi/ipmi_msghandler.c | 10 +- drivers/dma/dmatest.c | 1 drivers/extcon/extcon-palmas.c | 5 + drivers/gpu/drm/drm_drv.c | 2 drivers/gpu/drm/mgag200/mgag200_main.c | 2 drivers/gpu/drm/msm/msm_gem_submit.c | 7 + drivers/gpu/drm/sti/sti_vtg.c | 4 + drivers/i2c/busses/i2c-riic.c | 30 +++++- 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/misc/ims-pcu.c | 16 +++ drivers/media/i2c/adv7604.c | 3 + drivers/media/pci/bt8xx/dvb-bt8xx.c | 1 drivers/media/platform/exynos4-is/fimc-is.c | 8 +- drivers/media/rc/imon.c | 5 + drivers/media/usb/cx231xx/cx231xx-core.c | 7 + drivers/media/usb/dvb-usb/dib0700_devices.c | 24 ++--- drivers/mfd/ab8500-sysctrl.c | 14 ++- drivers/mmc/host/s3cmci.c | 1 drivers/net/bonding/bond_main.c | 2 drivers/net/can/c_can/c_can_pci.c | 1 drivers/net/can/c_can/c_can_platform.c | 1 drivers/net/ethernet/fealnx.c | 6 + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 10 +- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 6 + drivers/net/ethernet/intel/igb/e1000_82575.c | 11 ++ drivers/net/ethernet/intel/igb/e1000_i210.c | 4 - drivers/net/ethernet/intel/igb/igb_main.c | 21 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 23 ++--- drivers/net/macvtap.c | 2 drivers/net/tun.c | 7 + drivers/net/usb/qmi_wwan.c | 2 drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 3 - drivers/net/xen-netback/netback.c | 6 + drivers/pci/host/pci-mvebu.c | 101 ++++++++++++-------- drivers/platform/x86/hp-wmi.c | 60 +++++++----- drivers/platform/x86/intel_mid_thermal.c | 1 drivers/s390/block/dasd.c | 7 + 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/scsi/lpfc/lpfc_attr.c | 17 +++ drivers/scsi/lpfc/lpfc_sli.c | 3 + drivers/scsi/lpfc/lpfc_vport.c | 8 ++ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 - .../lustre/lustre/include/lustre/lustre_user.h | 18 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 7 + drivers/staging/lustre/lustre/llite/rw26.c | 4 + drivers/staging/lustre/lustre/ptlrpc/service.c | 21 ++-- drivers/staging/rtl8188eu/include/rtw_debug.h | 2 drivers/staging/rtl8712/ieee80211.h | 84 ++++++++--------- drivers/target/iscsi/iscsi_target.c | 49 ++++++---- drivers/target/iscsi/iscsi_target_erl0.c | 6 + drivers/target/iscsi/iscsi_target_erl0.h | 2 drivers/target/iscsi/iscsi_target_login.c | 4 + drivers/target/target_core_fabric_configfs.c | 5 + drivers/target/target_core_sbc.c | 71 ++------------ drivers/target/target_core_tpg.c | 51 +++++++++- drivers/target/target_core_transport.c | 88 +++++++++++------ drivers/tty/serial/omap-serial.c | 2 drivers/tty/serial/sh-sci.c | 17 ++- drivers/usb/core/devio.c | 14 +++ drivers/usb/core/hcd.c | 1 drivers/usb/core/quirks.c | 3 + drivers/usb/misc/usbtest.c | 5 + drivers/usb/serial/garmin_gps.c | 22 ++++ drivers/usb/serial/qcserial.c | 1 drivers/video/backlight/adp5520_bl.c | 12 ++ drivers/video/backlight/lcd.c | 4 - drivers/video/fbdev/pmag-ba-fb.c | 2 drivers/xen/manage.c | 12 ++ drivers/xen/swiotlb-xen.c | 19 ++++ fs/cifs/dir.c | 5 + fs/coda/upcall.c | 3 - fs/ext4/inode.c | 23 +++-- fs/ext4/mballoc.c | 6 + fs/ext4/super.c | 4 - fs/fscache/object-list.c | 7 + fs/ocfs2/alloc.c | 24 ++++- fs/ocfs2/file.c | 9 +- include/dt-bindings/pinctrl/omap.h | 4 - include/linux/netdevice.h | 3 + include/linux/phy.h | 8 -- include/linux/skbuff.h | 7 + include/net/tcp.h | 6 + include/sound/seq_kernel.h | 3 - include/target/target_core_base.h | 3 + include/target/target_core_fabric.h | 2 include/xen/swiotlb-xen.h | 5 + lib/asn1_decoder.c | 7 + lib/test_firmware.c | 11 ++ mm/page_ext.c | 4 - mm/pagewalk.c | 6 + net/8021q/vlan.c | 6 + net/core/dev.c | 6 + net/core/skbuff.c | 1 net/dsa/Kconfig | 5 + net/ipv4/ah4.c | 3 + net/ipv4/ipip.c | 58 ++++++++--- net/ipv4/tcp_output.c | 12 +- net/ipv6/ip6_flowlabel.c | 1 net/ipv6/ip6_output.c | 4 - net/l2tp/l2tp_ppp.c | 3 + net/mac80211/key.c | 53 ++++++++++ net/netlink/af_netlink.c | 17 ++- net/netlink/af_netlink.h | 1 net/sctp/input.c | 2 net/sctp/ipv6.c | 2 net/sctp/socket.c | 36 +++++++ net/unix/diag.c | 2 samples/trace_events/trace-events-sample.c | 14 ++- security/integrity/ima/ima_appraise.c | 3 + security/keys/Kconfig | 4 + security/keys/encrypted-keys/encrypted.c | 7 + security/keys/keyring.c | 39 ++++---- 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/core/seq/seq_clientmgr.c | 2 sound/core/seq/seq_device.c | 3 + sound/core/timer_compat.c | 17 +++ sound/drivers/vx/vx_pcm.c | 8 +- sound/pci/vx222/vx222_ops.c | 12 +- sound/pcmcia/vx/vxp_ops.c | 12 +- sound/soc/codecs/adau17x1.c | 24 +++++ sound/soc/codecs/adau17x1.h | 2 tools/testing/selftests/firmware/fw_filesystem.sh | 10 ++ tools/testing/selftests/firmware/fw_userhelper.sh | 28 +++++- 171 files changed, 1339 insertions(+), 665 deletions(-)