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

Author: Ralf Baechle <[email protected]> Tue Oct 24 15:36:52 2017 +0200
Commit: 326236d1261b963d9f23937524f6102862fe7993
Gitweb: https://git.linux-mips.org/g/ralf/linux/326236d1261b
Branch: linux-3.18-stable

---

 Makefile                                  |    2 -
 arch/x86/include/asm/tlbflush.h           |    7 ++
 block/bsg-lib.c                           |    1 
 crypto/Kconfig                            |    1 
 drivers/gpu/drm/drm_dp_mst_topology.c     |    2 +
 drivers/iio/adc/xilinx-xadc-core.c        |    6 +-
 drivers/irqchip/irq-crossbar.c            |    3 +
 drivers/isdn/i4l/isdn_ppp.c               |   37 +++++++---
 drivers/net/ethernet/mellanox/mlx4/main.c |    2 -
 drivers/scsi/device_handler/scsi_dh_emc.c |    2 -
 drivers/target/iscsi/iscsi_target_erl0.c  |    6 +-
 drivers/tty/goldfish.c                    |    2 -
 drivers/watchdog/kempld_wdt.c             |    9 ++
 fs/btrfs/send.c                           |    5 +
 fs/ext4/inode.c                           |    2 -
 fs/ext4/xattr.c                           |   19 ++++-
 fs/ocfs2/dlmglue.c                        |  105 ++++++++++++++++++++++++++++-
 fs/ocfs2/dlmglue.h                        |   18 +++++
 fs/ocfs2/ocfs2.h                          |    1 
 include/net/sctp/ulpevent.h               |    6 +-
 include/uapi/linux/mroute6.h              |    1 
 include/uapi/linux/rds.h                  |    3 +
 kernel/bpf/verifier.c                     |    3 +
 kernel/locking/lockdep.c                  |   11 ++-
 net/core/sock.c                           |    2 +
 net/ipv4/ip_vti.c                         |    3 +
 net/ipv6/ip6_vti.c                        |    3 +
 net/l2tp/l2tp_core.c                      |   14 ++--
 net/l2tp/l2tp_core.h                      |    5 +
 net/netfilter/nf_conntrack_expect.c       |    4 +
 net/packet/af_packet.c                    |   23 ++++--
 31 files changed, 246 insertions(+), 62 deletions(-)