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

Author: Ralf Baechle <[email protected]> Thu Jul 12 09:56:53 2018 +0200
Commit: e032b3078a0df003e67af8b8e82eb26805e7b0f5
Gitweb: https://git.linux-mips.org/g/ralf/linux/e032b3078a0d
Branch: linux-3.18-stable

---

 Makefile                                 |    2 -
 arch/x86/lib/cmdline.c                   |   34 ++++++++---
 drivers/atm/zatm.c                       |    4 +
 drivers/hid/hid-debug.c                  |    8 ++-
 drivers/hid/i2c-hid/i2c-hid.c            |    2 -
 drivers/md/dm-bufio.c                    |   15 ++++-
 drivers/media/i2c/cx25840/cx25840-core.c |   28 +++++++--
 drivers/mtd/chips/cfi_cmdset_0002.c      |   30 +++++++---
 drivers/mtd/nand/mxc_nand.c              |    5 +-
 drivers/mtd/ubi/eba.c                    |   92 ++++++++++++++++++++++++++++++
 drivers/net/ethernet/natsemi/sonic.c     |    2 -
 drivers/net/usb/qmi_wwan.c               |    1 
 drivers/scsi/sg.c                        |   42 +++++++++++++-
 drivers/staging/android/ion/ion_heap.c   |    2 -
 drivers/tty/n_tty.c                      |   13 +++-
 fs/cifs/cifssmb.c                        |   10 +++
 fs/cifs/smb2pdu.c                        |   18 ++++--
 fs/ext4/inline.c                         |    1 
 fs/ext4/super.c                          |   62 +++++++++++++++++---
 net/bridge/netfilter/ebtables.c          |    3 +
 net/netfilter/nf_log.c                   |    9 ++-
 21 files changed, 317 insertions(+), 66 deletions(-)