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

Author: Ralf Baechle <[email protected]> Fri Jun 15 01:35:46 2018 +0200
Commit: fdc74eacd75660b3aa1cfb2817e00ce8455517c3
Gitweb: https://git.linux-mips.org/g/ralf/linux/fdc74eacd756
Branch: linux-3.18-stable

---

 Makefile                                         |    2 +
 arch/mips/kernel/ptrace.c                        |    2 +
 arch/mips/kernel/ptrace32.c                      |    2 +
 drivers/gpu/drm/drm_fops.c                       |    1 +
 drivers/gpu/drm/i915/intel_lvds.c                |    8 ++++++
 drivers/isdn/hardware/eicon/diva.c               |   22 ++++++++++-----
 drivers/isdn/hardware/eicon/diva.h               |    5 ++-
 drivers/isdn/hardware/eicon/divasmain.c          |   18 ++++++++----
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c |    2 +
 drivers/net/ethernet/cisco/enic/enic_main.c      |    8 +++---
 drivers/net/ethernet/mellanox/mlx4/qp.c          |    4 +--
 drivers/net/team/team.c                          |    3 +-
 drivers/net/usb/cdc_mbim.c                       |    2 +
 fs/aio.c                                         |    3 +-
 include/linux/tcp.h                              |    2 +
 include/uapi/linux/nl80211.h                     |    2 +
 kernel/trace/trace_events_trigger.c              |    5 ++-
 mm/mmap.c                                        |   32 ++++++++++++++++++++++
 mm/vmscan.c                                      |    2 +
 net/core/rtnetlink.c                             |    8 +++---
 net/dccp/proto.c                                 |    2 -
 net/ipv4/tcp_input.c                             |   10 ++++---
 net/ipv6/ip6mr.c                                 |    3 +-
 net/packet/af_packet.c                           |    2 +
 security/selinux/ss/services.c                   |    2 +
 25 files changed, 104 insertions(+), 48 deletions(-)