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

Author: Ralf Baechle <[email protected]> Tue May 15 22:07:32 2018 +0200
Commit: 410cc69242719c1215de6d92085dc78928f447ac
Gitweb: https://git.linux-mips.org/g/ralf/linux/410cc6924271
Branch: linux-3.18-stable

---

 Documentation/devicetree/bindings/dma/snps-dma.txt |    2 
 Documentation/filesystems/ext4.txt                 |    2 
 Makefile                                           |    2 
 arch/arm/boot/dts/am4372.dtsi                      |    6 +
 arch/arm/boot/dts/s5pv210.dtsi                     |    1 
 arch/arm/boot/dts/spear1310-evb.dts                |    2 
 arch/arm/boot/dts/spear1340.dtsi                   |    4 -
 arch/arm/boot/dts/spear13xx.dtsi                   |    6 +
 arch/arm/boot/dts/spear600.dtsi                    |    1 
 arch/arm/mach-omap2/prm33xx.c                      |   12 --
 arch/powerpc/perf/core-book3s.c                    |    4 -
 arch/s390/kernel/compat_linux.c                    |    8 +
 arch/x86/crypto/twofish-x86_64-asm_64-3way.S       |  112 +++++++++++---------
 arch/x86/kvm/x86.c                                 |   34 +++++-
 arch/x86/mm/ioremap.c                              |    4 -
 arch/x86/mm/kmmio.c                                |   12 +-
 drivers/Makefile                                   |    1 
 drivers/crypto/s5p-sss.c                           |   13 ++
 drivers/devfreq/devfreq.c                          |    2 
 drivers/dma/dma-jz4740.c                           |    4 +
 drivers/gpu/drm/radeon/radeon_uvd.c                |    2 
 drivers/infiniband/hw/mlx4/main.c                  |   13 +-
 drivers/media/i2c/s5k6aa.c                         |    5 +
 drivers/media/tuners/r820t.c                       |   13 +-
 drivers/net/ethernet/freescale/gianfar.c           |    6 +
 drivers/net/ethernet/mellanox/mlx4/qp.c            |    3 +
 drivers/net/hippi/rrunner.c                        |    2 
 drivers/s390/block/dasd_eckd.c                     |   16 ++-
 drivers/spi/spi-sun4i.c                            |    2 
 drivers/usb/usbip/stub_dev.c                       |    3 +
 drivers/usb/usbip/vhci_hcd.c                       |    2 
 drivers/video/console/dummycon.c                   |    1 
 drivers/video/fbdev/atmel_lcdfb.c                  |    8 +
 drivers/video/fbdev/mmp/core.c                     |    5 +
 drivers/xen/Kconfig                                |    2 
 fs/btrfs/inode.c                                   |    5 +
 fs/btrfs/ioctl.c                                   |    2 
 fs/btrfs/tree-log.c                                |    9 ++
 fs/ext4/super.c                                    |    1 
 include/linux/string.h                             |    1 
 include/net/red.h                                  |   13 ++
 lib/oid_registry.c                                 |    8 +
 mm/early_ioremap.c                                 |    2 
 mm/util.c                                          |   24 ++++
 mm/vmscan.c                                        |    3 +
 net/core/dev.c                                     |    2 
 net/decnet/af_decnet.c                             |   62 ++++++-----
 net/ipv4/ip_sockglue.c                             |   14 +--
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |   16 ++-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |    6 +
 net/ipv6/ipv6_sockglue.c                           |   17 +--
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |   18 ++-
 net/netfilter/x_tables.c                           |   10 +-
 net/netfilter/xt_RATEEST.c                         |   22 +++-
 net/sched/sch_choke.c                              |    3 +
 net/sched/sch_gred.c                               |    3 +
 net/sched/sch_red.c                                |    2 
 net/sched/sch_sfq.c                                |    3 +
 net/xfrm/xfrm_user.c                               |   24 ++++
 scripts/kernel-doc                                 |    2 
 security/selinux/ss/services.c                     |   21 ++--
 sound/core/seq/seq_clientmgr.c                     |   23 ++--
 sound/soc/ux500/mop500.c                           |    4 +
 sound/soc/ux500/ux500_pcm.c                        |    5 +
 tools/perf/bench/numa.c                            |   56 +++++++++-
 tools/perf/builtin-top.c                           |   15 ++-
 66 files changed, 477 insertions(+), 234 deletions(-)