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

Author: Ralf Baechle <[email protected]> Thu Dec 21 14:25:53 2017 +0100
Commit: b2aa75754f7d4debfc9e2bd0a5e718ba7a42e268
Gitweb: https://git.linux-mips.org/g/ralf/linux/b2aa75754f7d
Branch: linux-3.18-stable

---

 Makefile                                |    2 +
 arch/arm/boot/dts/imx53-qsb-common.dtsi |   20 +++++------
 arch/powerpc/Kconfig                    |    5 ---
 arch/s390/Kconfig                       |    3 --
 arch/sparc/Kconfig                      |    3 --
 arch/x86/Kconfig                        |    4 --
 drivers/input/misc/ims-pcu.c            |   16 +++++++-
 drivers/net/macvtap.c                   |    2 +
 drivers/net/tun.c                       |    7 ++++
 drivers/target/iscsi/iscsi_target.c     |   19 ++++------
 drivers/usb/misc/usbtest.c              |    5 ++-
 fs/ceph/caps.c                          |    5 +--
 include/linux/netdevice.h               |    3 ++
 include/net/tcp.h                       |    6 ++-
 include/target/target_core_base.h       |    1 +
 net/core/dev.c                          |    6 ++-
 net/ipv4/ipip.c                         |   59 ++++++++++++++++++++++---------
 net/ipv4/tcp_output.c                   |    3 +-
 net/ipv6/ip6_flowlabel.c                |    1 +
 net/ipv6/ip6_gre.c                      |   11 ++++--
 net/ipv6/ip6_output.c                   |    4 +-
 net/l2tp/l2tp_ppp.c                     |    3 ++
 net/mac80211/key.c                      |   53 ++++++++++++++++++++++++++--
 net/sctp/input.c                        |    2 +
 net/sctp/socket.c                       |   32 +++++++++++++++++
 net/unix/diag.c                         |    2 +
 security/keys/Kconfig                   |    4 ++
 27 files changed, 201 insertions(+), 80 deletions(-)