Merge tag 'v4.12.2' 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:17:04 2017 +0200
Commit: 14bb12d8c183f9d174f29d862115814af0ff83fc
Gitweb: https://git.linux-mips.org/g/ralf/linux/14bb12d8c183
Branch: linux-4.12-stable

---

 Makefile                             |    2 +-
 arch/x86/include/asm/pat.h           |    1 +
 arch/x86/kernel/setup.c              |    7 ++++++
 arch/x86/mm/pat.c                    |   28 +++++++++-------------
 crypto/rsa-pkcs1pad.c                |    2 +-
 drivers/crypto/caam/caamalg.c        |    3 +-
 drivers/staging/comedi/comedi_fops.c |    1 +
 drivers/staging/vt6656/main_usb.c    |    3 ++
 drivers/tty/serial/imx.c             |   26 ++++-----------------
 fs/ext4/sysfs.c                      |    2 +-
 fs/proc/internal.h                   |    2 +-
 fs/proc/proc_sysctl.c                |   43 ++++++++++++++++++++++++----------
 include/linux/sysctl.h               |    2 +-
 ipc/mqueue.c                         |    4 ++-
 kernel/locking/rwsem-spinlock.c      |    4 ++-
 15 files changed, 70 insertions(+), 60 deletions(-)