Merge tag 'v3.2.97' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.2-stable

Author: Ralf Baechle <[email protected]> Thu Jan 4 16:00:12 2018 +0100
Commit: 917dbac98e0733cde6e2db4f54bfa191ad73083a
Gitweb: https://git.linux-mips.org/g/ralf/linux/917dbac98e07
Branch: linux-3.2-stable

---

 Makefile                                 |    2 -
 arch/arm/kernel/traps.c                  |   28 +++++---
 arch/mips/ar7/platform.c                 |    1 
 arch/s390/mm/gup.c                       |    7 +-
 arch/sh/include/cpu-sh4/cpu/sh7722.h     |    2 -
 arch/sh/include/cpu-sh4/cpu/sh7757.h     |    8 +-
 arch/tile/kernel/setup.c                 |    3 +
 arch/x86/crypto/salsa20_glue.c           |    7 --
 arch/x86/include/asm/kvm_para.h          |    4 +
 arch/x86/kernel/kvm.c                    |   22 +++---
 arch/x86/kvm/svm.c                       |    2 -
 arch/x86/kvm/vmx.c                       |    7 --
 arch/x86/kvm/x86.c                       |    8 +-
 arch/x86/oprofile/op_model_ppro.c        |    4 +
 crypto/hmac.c                            |    6 +-
 crypto/salsa20_generic.c                 |    7 --
 crypto/shash.c                           |   13 ++--
 drivers/crypto/talitos.c                 |    4 +
 drivers/input/ff-core.c                  |   13 +++-
 drivers/input/misc/uinput.c              |   18 +++++
 drivers/iommu/amd_iommu.c                |    1 
 drivers/net/can/usb/esd_usb2.c           |    2 -
 drivers/net/macvtap.c                    |    6 +-
 drivers/net/tun.c                        |    4 +
 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                        |   14 +++-
 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                   |    2 -
 drivers/usb/core/quirks.c                |    4 +
 drivers/usb/gadget/dummy_hcd.c           |   56 +++++++++++++---
 drivers/usb/gadget/inode.c               |   72 +++++++++++++++++----
 drivers/usb/host/pci-quirks.c            |    8 +-
 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/option.c              |    2 +
 drivers/usb/storage/unusual_devs.h       |    7 ++
 drivers/uwb/hwa-rc.c                     |    2 +
 drivers/uwb/uwbd.c                       |   12 ++-
 fs/bio.c                                 |   14 +++-
 fs/ecryptfs/ecryptfs_kernel.h            |   25 +++++--
 fs/ecryptfs/keystore.c                   |    9 ++-
 fs/fscache/object-list.c                 |    7 ++
 fs/ocfs2/alloc.c                         |   24 +++++--
 fs/read_write.c                          |    4 +
 fs/xattr.c                               |    2 -
 include/crypto/internal/hash.h           |    8 ++
 include/linux/input.h                    |    1 
 include/linux/key.h                      |    2 +
 include/linux/spi/spidev.h               |    1 
 include/net/bluetooth/l2cap.h            |    1 
 include/net/tcp.h                        |    6 +-
 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 +-
 kernel/params.c                          |    2 -
 kernel/ptrace.c                          |    3 -
 kernel/sysctl.c                          |    3 +
 net/bluetooth/bnep/core.c                |    3 +
 net/bluetooth/cmtp/core.c                |    3 +
 net/bluetooth/hidp/core.c                |    2 +
 net/bluetooth/l2cap_sock.c               |    6 ++
 net/core/rtnetlink.c                     |    5 +
 net/dccp/proto.c                         |    5 +
 net/ipv4/tcp_output.c                    |    3 +
 net/l2tp/l2tp_eth.c                      |   51 +--------------
 net/l2tp/l2tp_ip.c                       |   20 ++----
 net/l2tp/l2tp_ppp.c                      |   10 +++
 net/packet/af_packet.c                   |    4 +
 net/sctp/sm_sideeffect.c                 |    4 +
 net/xfrm/xfrm_user.c                     |    3 +
 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                  |   23 ++++---
 security/keys/process_keys.c             |    9 ++-
 security/keys/request_key.c              |   46 +++++++++++--
 security/keys/request_key_auth.c         |   69 +++++++++-----------
 security/keys/trusted.c                  |   71 ++++++++++-----------
 security/selinux/hooks.c                 |    2 -
 security/smack/smack_lsm.c               |   57 ++++++++---------
 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                       |  103 ++++++++++++++++++++----------
 sound/core/timer_compat.c                |   17 ++++-
 sound/usb/caiaq/device.c                 |   12 +++
 sound/usb/usx2y/usb_stream.c             |    6 +-
 104 files changed, 768 insertions(+), 415 deletions(-)