Merge tag 'v4.12.12' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.12-stable

Author: Ralf Baechle <[email protected]> Thu Sep 21 00:21:52 2017 +0200
Commit: 411e11c15ccc64aa16cfebb4a1d0ee214728733c
Gitweb: https://git.linux-mips.org/g/ralf/linux/411e11c15ccc
Branch: linux-4.12-stable

---

 Makefile                                           |    2 
 arch/s390/include/asm/pgtable.h                    |    2 
 arch/s390/mm/gmap.c                                |   39 +++++-
 arch/s390/mm/mmap.c                                |    6 +
 drivers/android/Kconfig                            |    2 
 drivers/android/binder.c                           |    8 +
 drivers/ata/ahci.c                                 |    9 +
 drivers/ata/pata_amd.c                             |    1 
 drivers/ata/pata_cs5536.c                          |    1 
 drivers/base/bus.c                                 |    2 
 drivers/bluetooth/btusb.c                          |    1 
 drivers/crypto/caam/caamalg.c                      |   66 ++---------
 drivers/crypto/caam/caamalg_qi.c                   |    6 -
 drivers/crypto/caam/error.c                        |   40 +++++++
 drivers/crypto/caam/error.h                        |    4 +
 drivers/crypto/caam/qi.c                           |    2 
 drivers/fpga/altera-hps2fpga.c                     |    4 -
 drivers/gpu/drm/nouveau/nv50_display.c             |    7 +
 drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c     |    4 +
 drivers/hid/wacom_wac.c                            |    8 +
 drivers/hwtracing/intel_th/pci.c                   |   10 ++
 drivers/iio/adc/ti-ads1015.c                       |  123 ++++++++++++--------
 drivers/input/mouse/trackpoint.c                   |    4 -
 drivers/mcb/mcb-lpc.c                              |   15 ++
 drivers/net/wireless/ath/ath10k/core.c             |   12 +-
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c      |    1 
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |    2 
 drivers/net/wireless/marvell/mwifiex/scan.c        |    6 +
 drivers/net/wireless/realtek/rtlwifi/pci.c         |    4 -
 .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c    |    2 
 .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c    |    2 
 .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c    |    4 +
 .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c    |    2 
 .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c    |    2 
 .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c    |    2 
 .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c    |    2 
 .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c    |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c    |   19 +--
 drivers/of/device.c                                |    2 
 drivers/scsi/sg.c                                  |   19 ++-
 drivers/staging/rts5208/rtsx_scsi.c                |    2 
 drivers/usb/core/devio.c                           |    4 -
 drivers/usb/core/quirks.c                          |    6 +
 drivers/usb/host/pci-quirks.c                      |   35 +++---
 drivers/usb/musb/musb_core.c                       |   18 ++-
 drivers/usb/serial/option.c                        |    1 
 fs/dlm/user.c                                      |    4 +
 include/linux/pci_ids.h                            |    1 
 include/linux/workqueue.h                          |    2 
 include/uapi/linux/android/binder.h                |    2 
 kernel/configs/android-base.config                 |    1 
 51 files changed, 344 insertions(+), 194 deletions(-)