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

Author: Ralf Baechle <[email protected]> Tue May 15 22:08:03 2018 +0200
Commit: cecf05a4384168b2fbba18be3f02a47eec4fd216
Gitweb: https://git.linux-mips.org/g/ralf/linux/cecf05a43841
Branch: linux-3.18-stable

---

 Makefile                           |    2 +-
 arch/arm64/kernel/traps.c          |    2 +-
 arch/x86/oprofile/nmi_int.c        |    2 +-
 drivers/iio/imu/adis_trigger.c     |    7 +++---
 drivers/iio/industrialio-buffer.c  |    2 +-
 drivers/irqchip/irq-gic-v3.c       |    2 +-
 drivers/pci/host/pci-keystone.c    |    9 ++++++--
 drivers/scsi/ibmvscsi/ibmvfc.h     |    2 +-
 drivers/usb/dwc3/gadget.c          |    2 ++
 drivers/usb/gadget/function/f_fs.c |    6 ++---
 lib/asn1_decoder.c                 |   43 ++++++++++++++++++++----------------
 net/ipv4/ip_sockglue.c             |    7 +-----
 net/ipv6/ipv6_sockglue.c           |   10 ++------
 net/mac80211/cfg.c                 |    2 +-
 14 files changed, 49 insertions(+), 49 deletions(-)