Merge tag 'v3.18.105' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Sat, 16 Jun 2018 06:22:17 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993941AbeFPEWVFa3Xh/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:34:20 2018 +0200 Commit: 91474c1d6219e1b515a086c2f0f7d9e14cebbfeb Gitweb: https://git.linux-mips.org/g/ralf/linux/91474c1d6219 Branch: linux-3.18-stable --- Makefile | 2 arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 arch/arm/include/asm/xen/events.h | 2 arch/arm/mach-davinci/devices-da8xx.c | 10 ++ arch/arm64/include/asm/futex.h | 8 +- arch/mips/mm/pgtable-32.c | 6 + arch/powerpc/kernel/time.c | 14 ++- arch/powerpc/kvm/book3s_pr_papr.c | 34 +++++-- arch/powerpc/platforms/cell/spufs/coredump.c | 2 arch/s390/kernel/vmlinux.lds.S | 8 +- arch/sparc/kernel/ldc.c | 7 + arch/x86/kernel/tsc.c | 2 arch/x86/kvm/svm.c | 24 ++--- arch/x86/kvm/vmx.c | 7 + block/bio-integrity.c | 3 + block/partition-generic.c | 4 + crypto/async_tx/async_pq.c | 5 - drivers/acpi/acpica/evxfevnt.c | 18 ++++ drivers/acpi/acpica/psobject.c | 14 +++ drivers/ata/libahci_platform.c | 5 + drivers/char/random.c | 10 +- drivers/edac/mv64x60_edac.c | 2 drivers/gpu/drm/omapdrm/omap_gem.c | 4 - drivers/iio/magnetometer/st_magn_spi.c | 2 drivers/infiniband/ulp/srpt/ib_srpt.c | 6 - drivers/isdn/mISDN/stack.c | 2 drivers/leds/leds-pca955x.c | 2 drivers/md/bcache/alloc.c | 19 +++- drivers/md/bcache/super.c | 6 + drivers/media/i2c/cx25840/cx25840-core.c | 36 ++++--- drivers/media/rc/mceusb.c | 9 +- drivers/net/bonding/bond_main.c | 84 +++++++++-------- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 19 +++- drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 drivers/net/ethernet/freescale/fsl_pq_mdio.c | 9 ++ drivers/net/ethernet/ibm/emac/core.c | 26 ++++- drivers/net/ethernet/intel/e1000e/netdev.c | 17 +++ drivers/net/ethernet/marvell/sky2.c | 2 drivers/net/ethernet/mellanox/mlx4/mcg.c | 15 ++- drivers/net/ethernet/mellanox/mlx4/qp.c | 13 +++ .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 2 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 - drivers/net/ethernet/qualcomm/qca_spi.c | 10 +- drivers/net/ethernet/realtek/r8169.c | 4 - drivers/net/ethernet/renesas/sh_eth.c | 2 drivers/net/ethernet/ti/cpsw.c | 16 +++ drivers/net/hamradio/hdlcdrv.c | 2 drivers/net/phy/phy.c | 6 + drivers/net/ppp/pptp.c | 1 drivers/net/virtio_net.c | 16 +++ drivers/net/vmxnet3/vmxnet3_drv.c | 5 + drivers/net/vxlan.c | 2 drivers/net/wireless/ath/ath5k/debug.c | 5 + drivers/net/wireless/ray_cs.c | 7 + drivers/net/wireless/ti/wl1251/main.c | 3 - drivers/powercap/powercap_sys.c | 1 drivers/rtc/interface.c | 9 ++ drivers/scsi/bnx2fc/bnx2fc.h | 1 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 10 ++ drivers/scsi/libiscsi.c | 24 +++++ drivers/scsi/libsas/sas_expander.c | 4 + drivers/staging/wlan-ng/prism2mgmt.c | 2 drivers/tty/n_gsm.c | 17 +++ drivers/tty/serial/sccnxp.c | 15 ++- drivers/usb/chipidea/core.c | 29 ++++-- drivers/usb/dwc3/dwc3-keystone.c | 4 + drivers/usb/host/xhci-plat.c | 1 drivers/usb/storage/ene_ub6250.c | 11 +- drivers/vhost/vhost.c | 3 - drivers/video/fbdev/vfb.c | 17 +++ fs/btrfs/extent_io.c | 2 fs/cifs/file.c | 2 fs/cifs/smb2pdu.c | 14 ++- fs/ext4/file.c | 2 fs/lockd/svc.c | 6 + fs/nfs/nfs4proc.c | 7 + fs/nfs/nfs4state.c | 10 +- fs/overlayfs/inode.c | 12 ++ include/linux/mlx4/qp.h | 1 include/linux/skbuff.h | 8 +- include/net/x25.h | 4 - kernel/events/core.c | 15 ++- kernel/futex.c | 98 +++++++++++++++++++- kernel/pid.c | 4 + net/bluetooth/hci_core.c | 17 +++ net/ceph/osdmap.c | 1 net/core/dev.c | 4 - net/core/neighbour.c | 14 ++- net/core/net_namespace.c | 19 ++++ net/core/skbuff.c | 65 +++++++++---- net/core/sysctl_net_core.c | 2 net/ipv4/ah4.c | 8 +- net/ipv4/esp4.c | 12 ++ net/ipv4/ip_tunnel.c | 11 +- net/ipv6/addrconf.c | 5 + net/ipv6/ah6.c | 8 +- net/ipv6/esp6.c | 12 ++ net/ipv6/ip6_gre.c | 8 +- net/ipv6/ip6_output.c | 13 ++- net/ipv6/ip6_tunnel.c | 7 + net/ipv6/ip6_vti.c | 7 + net/ipv6/sit.c | 8 +- net/key/af_key.c | 2 net/l2tp/l2tp_netlink.c | 2 net/llc/af_llc.c | 3 + net/mac80211/mlme.c | 4 + net/netfilter/nf_conntrack_netlink.c | 7 + net/netlink/af_netlink.c | 3 + net/rxrpc/rxkad.c | 21 +++- net/sched/act_api.c | 4 + net/sctp/ipv6.c | 4 + net/sctp/socket.c | 17 ++- net/x25/af_x25.c | 24 +++-- net/x25/sysctl_net_x25.c | 5 + net/xfrm/xfrm_state.c | 2 scripts/tags.sh | 1 tools/perf/builtin-trace.c | 4 + tools/perf/tests/code-reading.c | 20 ++++ tools/perf/util/unwind-libdw.c | 8 ++ .../testing/selftests/powerpc/tm/tm-resched-dscr.c | 2 121 files changed, 922 insertions(+), 313 deletions(-)