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

Author: Ralf Baechle <[email protected]> Fri Aug 31 02:37:22 2018 +0200
Commit: ba525668303e9aae671914be50a5e81d41e542d1
Gitweb: https://git.linux-mips.org/g/ralf/linux/ba525668303e
Branch: linux-3.18-stable

---

 Makefile                                           |    2 -
 arch/arm/boot/dts/am3517.dtsi                      |    5 ++
 arch/arm/boot/dts/am437x-sk-evm.dts                |    2 +
 arch/arm/boot/dts/da850.dtsi                       |    6 --
 arch/arm/configs/imx_v4_v5_defconfig               |    2 +
 arch/arm/mach-pxa/irq.c                            |    4 +
 arch/arm64/kernel/smp.c                            |    2 -
 arch/m68k/include/asm/mcf_pgalloc.h                |    4 +
 drivers/dma/k3dma.c                                |    2 -
 drivers/gpu/drm/armada/armada_hw.h                 |    1 
 drivers/gpu/drm/armada/armada_overlay.c            |   30 +++++++---
 drivers/gpu/drm/exynos/exynos_drm_gsc.c            |   29 ++++++---
 drivers/gpu/drm/exynos/regs-gsc.h                  |    1 
 drivers/isdn/i4l/isdn_common.c                     |    8 ---
 drivers/md/raid10.c                                |    7 ++
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |    1 
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |    6 ++
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |    6 ++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |    2 -
 drivers/net/ethernet/cisco/enic/enic_clsf.c        |    3 -
 drivers/net/ethernet/cisco/enic/enic_main.c        |    3 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |   12 ++++
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c  |    2 +
 drivers/net/ethernet/qualcomm/qca_spi.c            |    5 +-
 drivers/net/ethernet/ti/davinci_emac.c             |    4 +
 drivers/net/hamradio/bpqether.c                    |    8 +--
 drivers/net/usb/rtl8150.c                          |    2 -
 drivers/net/usb/smsc75xx.c                         |   62 ++++++++++++++++++++
 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c |    7 ++
 drivers/pci/hotplug/pci_hotplug_core.c             |    9 +++
 drivers/staging/android/ion/ion.c                  |   17 +++++
 drivers/tty/serial/8250/8250_dw.c                  |    2 -
 drivers/usb/dwc2/hcd_intr.c                        |    3 -
 drivers/usb/gadget/composite.c                     |    3 +
 drivers/usb/serial/sierra.c                        |    4 +
 fs/reiserfs/xattr.c                                |    4 +
 include/net/af_vsock.h                             |    4 +
 include/net/llc.h                                  |    5 ++
 include/net/net_namespace.h                        |    1 
 include/net/netns/ipv6.h                           |    1 
 kernel/locking/lockdep.c                           |   12 ++--
 kernel/trace/trace.c                               |    5 ++
 net/bluetooth/sco.c                                |    3 +
 net/core/dev.c                                     |    4 +
 net/dccp/ccids/ccid2.c                             |    6 +-
 net/ipv4/netfilter/ip_tables.c                     |    1 
 net/ipv4/tcp.c                                     |    4 +
 net/ipv6/mcast.c                                   |    9 ++-
 net/ipv6/netfilter/ip6_tables.c                    |    1 
 net/ipv6/netfilter/nf_conntrack_reasm.c            |    6 +-
 net/l2tp/l2tp_core.c                               |    2 -
 net/llc/llc_core.c                                 |    4 +
 net/netfilter/nf_conntrack_proto_dccp.c            |    8 +--
 net/packet/af_packet.c                             |   10 ++-
 net/sched/cls_tcindex.c                            |    8 +--
 net/vmw_vsock/af_vsock.c                           |   15 +++--
 net/vmw_vsock/vmci_transport.c                     |    3 -
 net/xfrm/xfrm_user.c                               |    8 ++-
 security/smack/smack_lsm.c                         |    1 
 sound/core/memalloc.c                              |    8 +--
 sound/core/seq/seq_virmidi.c                       |   10 +++
 sound/pci/cs5535audio/cs5535audio.h                |    6 +-
 sound/pci/cs5535audio/cs5535audio_pcm.c            |    4 +
 sound/pci/vx222/vx222_ops.c                        |    8 +--
 sound/pcmcia/vx/vxp_ops.c                          |   10 ++-
 tools/perf/arch/powerpc/util/skip-callchain-idx.c  |    2 -
 tools/testing/selftests/sync/config                |    4 +
 67 files changed, 315 insertions(+), 128 deletions(-)