Merge tag 'v3.18.60' 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:35:37 2017 +0200
Commit: 04adb948832ec34eb9ef0a30594624c3a5ad5b77
Gitweb: https://git.linux-mips.org/g/ralf/linux/04adb948832e
Branch: linux-3.18-stable

---

 Documentation/sysctl/kernel.txt            |   15 ++++-----
 Makefile                                   |    2 +
 arch/arm/boot/dts/bcm5301x.dtsi            |    4 +-
 arch/arm/mm/mmu.c                          |    8 ++---
 arch/arm64/kernel/setup.c                  |    3 +-
 arch/mips/kernel/entry.S                   |    3 ++
 arch/mips/kernel/pm-cps.c                  |    9 +----
 arch/mips/kernel/traps.c                   |    2 +
 arch/x86/kvm/vmx.c                         |    2 +
 arch/x86/kvm/x86.c                         |    2 +
 drivers/cpufreq/s3c2416-cpufreq.c          |    1 -
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c |    1 +
 drivers/iommu/amd_iommu_v2.c               |    2 +
 drivers/iommu/intel-iommu.c                |    2 +
 drivers/mtd/bcm47xxpart.c                  |    4 +-
 drivers/net/ethernet/korina.c              |    8 ++---
 drivers/usb/gadget/function/f_fs.c         |    8 ++++-
 drivers/usb/host/xhci-ring.c               |   11 -------
 drivers/usb/host/xhci.c                    |   13 --------
 drivers/watchdog/bcm_kona_wdt.c            |    3 +-
 include/net/xfrm.h                         |   10 ------
 kernel/sysctl.c                            |    2 +
 mm/huge_memory.c                           |    7 ++++
 net/8021q/vlan.c                           |    3 +-
 net/caif/cfpkt_skbuff.c                    |    6 +---
 net/core/dev.c                             |    3 +-
 net/core/dst.c                             |   14 ++++++++
 net/decnet/dn_route.c                      |   14 ++------
 net/decnet/netfilter/dn_rtmsg.c            |    4 ++
 net/ipv4/igmp.c                            |   22 ++++++++-----
 net/ipv6/addrconf.c                        |    6 ++--
 net/ipv6/ip6_output.c                      |    6 ++--
 net/key/af_key.c                           |   17 ++++++++--
 net/netfilter/nf_conntrack_netlink.c       |    4 ++
 net/netfilter/xt_TCPMSS.c                  |    6 +++-
 net/xfrm/xfrm_policy.c                     |   47 ----------------------------
 sound/pci/hda/hda_generic.c                |    1 +
 37 files changed, 120 insertions(+), 155 deletions(-)