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

[email protected] Sat, 16 Jun 2018 06:21:53 +0200
Newsgroups gmane.linux.ports.mips.cvs
Message-ID <S23993860AbeFPEV45ZDyh/[email protected]>
Author: Ralf Baechle <[email protected]> Tue May 15 22:09:53 2018 +0200
Commit: d3bb852f70b7146aa4c3991d4e0b998c933e9dbe
Gitweb: https://git.linux-mips.org/g/ralf/linux/d3bb852f70b7
Branch: linux-3.18-stable

---

 Makefile                                 |    2 
 arch/mips/kernel/smp-bmips.c             |    8 +-
 arch/x86/kernel/cpu/mcheck/mce.c         |   22 +++++
 arch/x86/kernel/machine_kexec_64.c       |    1 
 arch/x86/kernel/module.c                 |   14 +++
 arch/x86/tools/relocs.c                  |    3 +
 drivers/input/keyboard/matrix_keypad.c   |    4 +
 drivers/mtd/ubi/vmt.c                    |   15 ++--
 drivers/scsi/qla2xxx/qla_init.c          |    1 
 drivers/staging/android/ashmem.c         |   15 ++--
 drivers/tty/serial/8250/8250_pci.c       |   11 +++
 drivers/tty/serial/atmel_serial.c        |    1 
 drivers/tty/serial/sh-sci.c              |    2 
 drivers/usb/core/message.c               |    4 +
 drivers/usb/core/quirks.c                |    3 -
 drivers/usb/mon/mon_text.c               |  124 +++++++++++++++++++-----------
 drivers/usb/storage/uas.c                |    2 
 include/linux/usb/quirks.h               |    3 +
 net/bridge/netfilter/ebt_among.c         |   21 +++++
 net/bridge/netfilter/ebtables.c          |   13 +++
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c |    4 +
 net/netfilter/nf_nat_proto_common.c      |    7 +-
 net/netfilter/xt_IDLETIMER.c             |    9 +-
 net/netfilter/xt_LED.c                   |   12 +--
 net/sctp/sm_make_chunk.c                 |    2 
 scripts/recordmcount.c                   |   14 +++
 sound/core/seq/seq_clientmgr.c           |   21 +++--
 sound/core/seq/seq_fifo.c                |    2 
 sound/core/seq/seq_memory.c              |   14 ++-
 sound/core/seq/seq_memory.h              |    3 -
 30 files changed, 261 insertions(+), 96 deletions(-)