Merge tag 'v4.12.6' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.12-stable
[email protected] Fri, 22 Sep 2017 10:22:39 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994799AbdIVIWm4cdmV/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Sep 21 00:18:44 2017 +0200 Commit: 2c9b78b19dfec26b7ef25c708b17c9684d2505db Gitweb: https://git.linux-mips.org/g/ralf/linux/2c9b78b19dfe Branch: linux-4.12-stable --- Makefile | 2 arch/arm/boot/dts/armada-388-gp.dts | 4 arch/arm/boot/dts/tango4-vantage-1172.dts | 2 arch/arm/mach-mvebu/platsmp.c | 2 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 arch/mips/include/asm/mach-ralink/ralink_regs.h | 2 arch/parisc/include/asm/thread_info.h | 2 arch/parisc/kernel/cache.c | 5 arch/parisc/kernel/irq.c | 2 arch/powerpc/kernel/irq.c | 15 + arch/powerpc/kernel/ptrace.c | 13 + arch/sparc/include/asm/mmu_context_64.h | 14 + arch/sparc/include/asm/trap_block.h | 1 arch/sparc/kernel/smp_64.c | 185 ++++++++++------- arch/sparc/kernel/sun4v_ivec.S | 15 + arch/sparc/kernel/traps_64.c | 1 arch/sparc/kernel/tsb.S | 12 + arch/sparc/lib/U3memcpy.S | 4 arch/sparc/mm/init_64.c | 25 ++ arch/sparc/power/hibernate.c | 3 arch/x86/kernel/kvm.c | 6 - block/blk-core.c | 4 block/blk-mq-cpumap.c | 5 block/blk-mq.c | 120 +---------- block/blk-mq.h | 5 drivers/acpi/acpi_lpss.c | 14 + drivers/ata/libata-scsi.c | 6 - drivers/clk/sunxi-ng/ccu-sun5i.c | 2 drivers/gpio/gpiolib.c | 9 - drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 41 ++-- drivers/gpu/drm/amd/amdgpu/si.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 9 + drivers/iommu/amd_iommu.c | 1 drivers/media/pci/saa7164/saa7164-bus.c | 13 - drivers/media/platform/davinci/vpfe_capture.c | 22 -- drivers/media/rc/ir-lirc-codec.c | 2 drivers/media/rc/ir-spi.c | 9 + drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 drivers/mmc/core/host.c | 72 +++--- drivers/mmc/host/dw_mmc.c | 24 +- drivers/mmc/host/sdhci-of-at91.c | 35 +++ drivers/net/bonding/bond_main.c | 4 drivers/net/dsa/b53/b53_common.c | 1 drivers/net/dsa/mv88e6xxx/chip.c | 1 drivers/net/ethernet/aurora/nb8800.c | 9 - drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 25 ++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 222 ++++++++++++++------ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 4 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 16 + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 25 +- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 drivers/net/irda/mcs7780.c | 16 + drivers/net/phy/phy.c | 3 drivers/net/virtio_net.c | 5 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 drivers/scsi/Kconfig | 2 drivers/target/target_core_user.c | 16 + fs/btrfs/extent-tree.c | 4 fs/ext4/acl.c | 25 ++ fs/ext4/file.c | 3 fs/ext4/resize.c | 3 fs/nfs/nfs4proc.c | 11 - fs/nfs/nfs4xdr.c | 2 fs/ocfs2/acl.c | 24 +- fs/userfaultfd.c | 5 include/linux/cpuhotplug.h | 1 include/linux/cpuset.h | 19 ++ include/linux/mlx5/mlx5_ifc.h | 10 + include/linux/mm_types.h | 4 include/linux/nfs_xdr.h | 2 include/linux/workqueue.h | 4 include/net/sctp/sctp.h | 4 include/net/udp.h | 1 include/sound/soc.h | 6 - kernel/cgroup/cgroup-internal.h | 3 kernel/cgroup/cgroup.c | 66 +++--- kernel/cgroup/cpuset.c | 1 kernel/time/timer.c | 2 kernel/workqueue.c | 23 ++ mm/hugetlb.c | 9 - mm/internal.h | 5 mm/madvise.c | 1 mm/memory.c | 1 mm/mprotect.c | 1 mm/mremap.c | 8 + mm/rmap.c | 36 +++ net/core/dev_ioctl.c | 3 net/core/rtnetlink.c | 4 net/dccp/feat.c | 7 - net/dccp/ipv4.c | 1 net/dccp/ipv6.c | 1 net/ipv4/fib_frontend.c | 9 - net/ipv4/fib_semantics.c | 2 net/ipv4/syncookies.c | 1 net/ipv4/tcp_bbr.c | 49 +++- net/ipv4/udp.c | 3 net/ipv6/ip6_output.c | 4 net/ipv6/output_core.c | 8 + net/ipv6/syncookies.c | 1 net/ipv6/udp.c | 27 ++ net/openvswitch/conntrack.c | 7 - net/packet/af_packet.c | 2 net/sctp/sm_make_chunk.c | 4 sound/pci/hda/patch_realtek.c | 1 sound/soc/soc-core.c | 25 -- sound/soc/soc-pcm.c | 36 +-- sound/soc/ux500/mop500.c | 4 virt/kvm/arm/mmu.c | 4 112 files changed, 949 insertions(+), 626 deletions(-)