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

Author: Ralf Baechle <[email protected]> Wed Sep 20 23:39:15 2017 +0200
Commit: a8b741e9c143e593a41677429e22a49b0ea97270
Gitweb: https://git.linux-mips.org/g/ralf/linux/a8b741e9c143
Branch: linux-3.18-stable

---

 Makefile                                    |    2 +
 drivers/acpi/apei/ghes.c                    |    1 +
 drivers/gpu/drm/drm_gem.c                   |    6 ++--
 drivers/iio/imu/adis16480.c                 |    2 +
 drivers/input/mouse/trackpoint.c            |    3 +-
 drivers/input/mouse/trackpoint.h            |    3 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c |    1 +
 fs/cifs/dir.c                               |   18 ++++++++----
 fs/cifs/smb2pdu.c                           |    4 +--
 fs/nfsd/nfs4xdr.c                           |    6 +---
 include/net/sch_generic.h                   |    5 +++
 kernel/events/core.c                        |   39 +++++++++++++--------------
 kernel/trace/trace_events_filter.c          |    4 +++
 net/bluetooth/bnep/core.c                   |   11 +++-----
 net/bluetooth/cmtp/core.c                   |   17 +++++++-----
 net/bluetooth/hidp/core.c                   |   33 +++++++++++++++--------
 net/dccp/proto.c                            |   19 +++++++++----
 net/ipv4/tcp_input.c                        |    3 +-
 net/irda/af_irda.c                          |    2 +
 net/sched/act_ipt.c                         |    2 +
 net/sctp/ipv6.c                             |    2 +
 sound/core/control.c                        |    2 +
 sound/pci/hda/patch_conexant.c              |    1 +
 23 files changed, 112 insertions(+), 74 deletions(-)