Merge tag 'v3.16.52' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.16-stable
[email protected] Mon, 08 Jan 2018 15:55:02 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992391AbeAHOzElHf11/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Jan 4 15:59:44 2018 +0100 Commit: c4b9ad6ad4d6b4a621787e8e16dce74151682bcc Gitweb: https://git.linux-mips.org/g/ralf/linux/c4b9ad6ad4d6 Branch: linux-3.16-stable --- Makefile | 2 arch/alpha/kernel/ptrace.c | 2 arch/arm/boot/dts/da850-evm.dts | 7 + arch/arm/include/asm/Kbuild | 1 arch/arm/include/asm/unaligned.h | 27 +++++ arch/arm/kernel/traps.c | 28 +++-- arch/arm/kvm/emulate.c | 5 - arch/arm/kvm/mmio.c | 4 - arch/arm64/kernel/head.S | 1 arch/arm64/kernel/traps.c | 28 +++-- arch/arm64/kvm/inject_fault.c | 16 +++ arch/arm64/mm/fault.c | 2 arch/blackfin/kernel/ptrace.c | 4 - arch/cris/arch-v32/kernel/ptrace.c | 2 arch/ia64/kernel/ptrace.c | 2 arch/mips/ar7/platform.c | 1 arch/mips/include/asm/mips-cm.h | 4 - arch/mips/kernel/ptrace32.c | 4 - arch/mips/mm/uasm-micromips.c | 2 arch/parisc/kernel/syscall.S | 6 + arch/powerpc/kernel/ptrace32.c | 4 - arch/powerpc/perf/core-book3s.c | 5 + arch/powerpc/platforms/pseries/mobility.c | 4 + arch/s390/mm/gup.c | 7 + arch/sh/include/cpu-sh2a/cpu/sh7264.h | 4 - arch/sh/include/cpu-sh2a/cpu/sh7269.h | 4 - arch/sh/include/cpu-sh4/cpu/sh7722.h | 2 arch/sh/include/cpu-sh4/cpu/sh7757.h | 8 + arch/tile/kernel/setup.c | 2 arch/x86/crypto/salsa20_glue.c | 7 - arch/x86/include/asm/uaccess.h | 14 ++- arch/x86/kernel/amd_nb.c | 48 +++++++++ arch/x86/kernel/cpu/microcode/intel.c | 18 +++ arch/x86/kvm/vmx.c | 7 - arch/x86/kvm/x86.c | 8 + arch/x86/oprofile/op_model_ppro.c | 4 - block/bio.c | 14 ++- crypto/hmac.c | 6 + crypto/salsa20_generic.c | 7 - crypto/shash.c | 13 +- drivers/block/rbd.c | 4 - drivers/bus/mvebu-mbus.c | 2 drivers/crypto/talitos.c | 7 + drivers/gpio/gpiolib-acpi.c | 2 drivers/gpu/drm/i915/intel_bios.c | 7 + drivers/hid/i2c-hid/i2c-hid.c | 3 - drivers/iio/adc/ad7793.c | 4 - drivers/iio/adc/ad_sigma_delta.c | 28 +++++ drivers/iio/adc/mcp320x.c | 1 drivers/iio/industrialio-core.c | 4 + drivers/infiniband/hw/mlx5/mem.c | 49 +++------ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 3 + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 13 -- drivers/input/ff-core.c | 13 ++ drivers/input/misc/ims-pcu.c | 16 +++ drivers/input/misc/uinput.c | 57 +++++++--- drivers/input/touchscreen/ti_am335x_tsc.c | 2 drivers/iommu/amd_iommu.c | 1 drivers/iommu/exynos-iommu.c | 2 drivers/net/can/c_can/c_can_pci.c | 1 drivers/net/can/c_can/c_can_platform.c | 1 drivers/net/can/usb/esd_usb2.c | 2 drivers/net/can/usb/gs_usb.c | 10 -- drivers/net/can/usb/kvaser_usb.c | 3 - drivers/net/macvtap.c | 6 + drivers/net/tun.c | 7 + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 58 ++--------- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 68 ++++++++++-- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 10 ++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 10 ++ drivers/pci/pci-sysfs.c | 11 ++ drivers/s390/scsi/zfcp_aux.c | 5 + drivers/s390/scsi/zfcp_erp.c | 18 ++- drivers/s390/scsi/zfcp_scsi.c | 5 + drivers/scsi/libiscsi.c | 2 drivers/scsi/lpfc/lpfc_init.c | 1 drivers/scsi/scsi_scan.c | 3 + drivers/scsi/sd.c | 16 ++- drivers/staging/iio/adc/ad7192.c | 4 - drivers/staging/iio/meter/ade7759.c | 2 drivers/usb/class/cdc-acm.c | 3 + drivers/usb/core/config.c | 6 + drivers/usb/core/hub.c | 13 +- drivers/usb/core/quirks.c | 4 + drivers/usb/gadget/composite.c | 5 + drivers/usb/gadget/dummy_hcd.c | 81 +++++++++++---- drivers/usb/gadget/f_mass_storage.c | 31 ++---- drivers/usb/gadget/f_mass_storage.h | 14 --- drivers/usb/gadget/inode.c | 55 ++++++++-- drivers/usb/gadget/mass_storage.c | 20 ---- drivers/usb/gadget/net2280.c | 5 - drivers/usb/host/pci-quirks.c | 8 + drivers/usb/host/xhci-hub.c | 22 +++- drivers/usb/host/xhci.h | 2 drivers/usb/renesas_usbhs/fifo.c | 23 +++- drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio_ids.h | 7 + drivers/usb/serial/metro-usb.c | 1 drivers/usb/serial/option.c | 2 drivers/usb/serial/qcserial.c | 4 + drivers/usb/storage/transport.c | 14 ++- drivers/usb/storage/unusual_devs.h | 7 + drivers/uwb/hwa-rc.c | 2 drivers/uwb/uwbd.c | 12 +- fs/block_dev.c | 6 + fs/btrfs/ioctl.c | 10 +- fs/cifs/cifsfs.c | 2 fs/cifs/connect.c | 8 + fs/cifs/file.c | 7 + fs/cifs/smb2pdu.c | 34 ++++-- fs/direct-io.c | 3 - fs/ecryptfs/ecryptfs_kernel.h | 25 +++-- fs/ecryptfs/keystore.c | 9 +- fs/exec.c | 22 +++- fs/fscache/object-list.c | 7 + fs/fuse/dir.c | 3 - fs/mpage.c | 14 ++- fs/ocfs2/alloc.c | 24 +++- fs/read_write.c | 4 - fs/xattr.c | 2 include/crypto/internal/hash.h | 8 + include/linux/buffer_head.h | 1 include/linux/capability.h | 2 include/linux/iio/adc/ad_sigma_delta.h | 3 + include/linux/input.h | 1 include/linux/key.h | 2 include/linux/mbus.h | 4 - include/linux/mm.h | 2 include/linux/mm_types.h | 1 include/linux/mmzone.h | 10 +- include/linux/netdevice.h | 3 + include/linux/of.h | 10 ++ include/linux/pci_ids.h | 2 include/linux/preempt_mask.h | 21 ++-- include/linux/ptrace.h | 11 +- include/linux/sched.h | 1 include/linux/skbuff.h | 7 + include/net/protocol.h | 2 include/net/route.h | 4 + include/net/tcp.h | 8 + include/net/udp.h | 2 include/scsi/scsi_device.h | 1 include/scsi/scsi_devinfo.h | 1 include/sound/seq_kernel.h | 3 - include/sound/seq_virmidi.h | 1 include/sound/timer.h | 2 include/trace/events/kvm.h | 7 + include/uapi/linux/spi/spidev.h | 1 kernel/capability.c | 36 ++++++- kernel/fork.c | 9 +- kernel/params.c | 2 kernel/ptrace.c | 91 +++++++++++------ kernel/sched/core.c | 21 +--- kernel/sched/features.h | 1 kernel/sysctl.c | 3 - kernel/trace/trace.c | 12 ++ kernel/workqueue.c | 37 +++---- kernel/workqueue_internal.h | 3 - lib/asn1_decoder.c | 7 + lib/digsig.c | 6 + mm/huge_memory.c | 14 +-- mm/init-mm.c | 2 mm/memory.c | 2 mm/memory_hotplug.c | 6 + mm/nommu.c | 2 net/8021q/vlan.c | 6 + net/bluetooth/bnep/core.c | 3 + net/bluetooth/cmtp/core.c | 3 + net/core/dev.c | 6 + net/core/rtnetlink.c | 5 + net/core/skbuff.c | 1 net/dccp/proto.c | 5 + net/ipv4/ip_input.c | 22 ++-- net/ipv4/ip_vti.c | 3 - net/ipv4/route.c | 44 +++++--- net/ipv4/tcp_ipv4.c | 9 +- net/ipv4/tcp_output.c | 12 ++ net/ipv4/udp.c | 30 ++++-- net/ipv6/ip6_gre.c | 41 ++++---- net/ipv6/ip6_vti.c | 3 - net/l2tp/l2tp_core.c | 10 +- net/l2tp/l2tp_core.h | 5 + net/l2tp/l2tp_eth.c | 51 --------- net/l2tp/l2tp_ip.c | 20 +--- net/l2tp/l2tp_ip6.c | 21 +--- net/l2tp/l2tp_ppp.c | 10 ++ net/netfilter/ipset/ip_set_core.c | 23 +++- net/netfilter/nfnetlink_cthelper.c | 10 ++ net/netfilter/x_tables.c | 4 - net/netfilter/xt_osf.c | 7 + net/netlink/af_netlink.c | 3 + net/packet/af_packet.c | 4 + net/sched/sch_generic.c | 1 net/sctp/input.c | 2 net/sctp/sm_sideeffect.c | 4 - net/unix/diag.c | 2 net/wireless/nl80211.c | 12 ++ net/xfrm/xfrm_state.c | 1 net/xfrm/xfrm_user.c | 3 - security/keys/big_key.c | 2 security/keys/encrypted-keys/encrypted.c | 7 + security/keys/internal.h | 2 security/keys/key.c | 2 security/keys/keyctl.c | 8 + security/keys/keyring.c | 72 +++++++------ security/keys/process_keys.c | 8 + security/keys/request_key.c | 46 +++++++- security/keys/request_key_auth.c | 69 ++++++------- security/keys/trusted.c | 69 ++++++------- security/smack/smack_lsm.c | 65 +++++------- security/yama/yama_lsm.c | 4 - sound/core/hrtimer.c | 1 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_virmidi.c | 27 +++-- sound/core/timer.c | 109 +++++++++++++------- sound/core/timer_compat.c | 17 +++ sound/pci/hda/hda_codec.c | 2 sound/soc/codecs/adau17x1.c | 24 ++++ sound/soc/codecs/adau17x1.h | 2 sound/usb/caiaq/device.c | 12 ++ sound/usb/usx2y/usb_stream.c | 6 + 226 files changed, 1732 insertions(+), 944 deletions(-)