Merge tag 'v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992800AbdFFPuqM6EC3/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jun 6 11:48:02 2017 +0200 Commit: fd4e36ceb4aa686f160d914f3e598e7210008815 Gitweb: https://git.linux-mips.org/g/ralf/linux/fd4e36ceb4aa Branch: master --- .../bindings/pinctrl/pinctrl-bindings.txt | 2 MAINTAINERS | 4 Makefile | 2 arch/arm64/include/asm/acpi.h | 6 - arch/arm64/kernel/pci.c | 4 arch/frv/include/asm/timex.h | 6 + arch/mips/kernel/process.c | 1 arch/openrisc/kernel/process.c | 2 arch/x86/kernel/cpu/microcode/amd.c | 16 +- arch/x86/kernel/process_32.c | 2 arch/x86/kvm/lapic.c | 5 - arch/x86/kvm/svm.c | 26 +-- arch/x86/kvm/vmx.c | 147 ++++++--------- arch/x86/kvm/x86.c | 7 + arch/x86/mm/pat.c | 9 - arch/x86/platform/efi/efi.c | 6 - arch/x86/platform/efi/efi_64.c | 79 +++++++- arch/x86/platform/efi/quirks.c | 3 block/blk-cgroup.c | 2 block/blk-core.c | 10 + block/blk-mq.c | 10 + block/blk-sysfs.c | 2 block/blk.h | 2 block/cfq-iosched.c | 17 ++ drivers/acpi/acpica/tbutils.c | 4 drivers/acpi/button.c | 2 drivers/acpi/sysfs.c | 7 + drivers/block/nbd.c | 15 +- drivers/block/rbd.c | 2 drivers/char/pcmcia/cm4040_cs.c | 6 - drivers/char/random.c | 6 + drivers/cpufreq/cpufreq.c | 1 drivers/cpufreq/kirkwood-cpufreq.c | 19 ++ drivers/dma/ep93xx_dma.c | 39 ++++ drivers/dma/mv_xor_v2.c | 109 +++++------ drivers/dma/pl330.c | 3 drivers/dma/sh/rcar-dmac.c | 3 drivers/dma/sh/usb-dmac.c | 2 drivers/firmware/dmi-id.c | 2 drivers/firmware/dmi_scan.c | 1 drivers/firmware/efi/efi-bgrt.c | 3 drivers/firmware/efi/libstub/secureboot.c | 4 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 10 + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 95 +++++++--- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 20 +- drivers/gpu/drm/drm_dp_helper.c | 83 +++++++++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 - drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 26 +-- drivers/gpu/drm/i915/gvt/execlist.c | 30 ++- drivers/gpu/drm/i915/gvt/handlers.c | 30 ++- drivers/gpu/drm/i915/i915_drv.c | 4 drivers/gpu/drm/i915/i915_drv.h | 3 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 drivers/gpu/drm/i915/i915_gem_shrinker.c | 5 - drivers/gpu/drm/i915/i915_irq.c | 15 +- drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/i915/intel_display.c | 22 +- drivers/gpu/drm/i915/intel_dp.c | 45 +---- drivers/gpu/drm/i915/intel_dp_mst.c | 5 - drivers/gpu/drm/i915/intel_drv.h | 13 - drivers/gpu/drm/i915/intel_lpe_audio.c | 36 ---- drivers/gpu/drm/i915/intel_lrc.c | 2 drivers/gpu/drm/i915/intel_lspcon.c | 2 drivers/gpu/drm/i915/selftests/i915_gem_context.c | 8 + drivers/gpu/drm/msm/Kconfig | 1 drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c | 2 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 9 + drivers/gpu/drm/msm/msm_drv.c | 1 drivers/gpu/drm/msm/msm_drv.h | 1 drivers/gpu/drm/msm/msm_fence.c | 10 - drivers/gpu/drm/msm/msm_gem.c | 6 + drivers/gpu/drm/msm/msm_gem_prime.c | 7 + drivers/gpu/drm/msm/msm_gem_submit.c | 14 + drivers/gpu/drm/msm/msm_gpu.c | 4 drivers/hid/Kconfig | 6 - drivers/hid/hid-asus.c | 12 + drivers/hid/hid-core.c | 3 drivers/hid/hid-elecom.c | 62 +++++- drivers/hid/hid-ids.h | 3 drivers/hid/hid-magicmouse.c | 15 +- drivers/hid/i2c-hid/i2c-hid.c | 13 + drivers/hid/wacom_wac.c | 45 ++--- drivers/hwmon/Kconfig | 1 drivers/hwmon/aspeed-pwm-tacho.c | 65 ++++--- drivers/infiniband/core/cm.c | 4 drivers/infiniband/core/cma.c | 13 + drivers/infiniband/core/core_priv.h | 10 + drivers/infiniband/core/netlink.c | 2 drivers/infiniband/core/sa_query.c | 6 - drivers/infiniband/core/umem.c | 2 drivers/infiniband/core/umem_odp.c | 6 + drivers/infiniband/core/uverbs_marshall.c | 8 - drivers/infiniband/hw/cxgb4/cm.c | 9 + drivers/infiniband/hw/cxgb4/device.c | 2 drivers/infiniband/hw/hfi1/chip.c | 67 +++++-- drivers/infiniband/hw/hfi1/chip_registers.h | 2 drivers/infiniband/hw/hfi1/hfi.h | 11 + drivers/infiniband/hw/hfi1/intr.c | 3 drivers/infiniband/hw/hfi1/pcie.c | 4 drivers/infiniband/hw/hfi1/rc.c | 5 - drivers/infiniband/hw/hfi1/sysfs.c | 3 drivers/infiniband/hw/i40iw/i40iw_cm.c | 3 drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 12 - drivers/infiniband/hw/i40iw/i40iw_main.c | 20 +- drivers/infiniband/hw/i40iw/i40iw_osdep.h | 1 drivers/infiniband/hw/i40iw/i40iw_type.h | 2 drivers/infiniband/hw/i40iw/i40iw_utils.c | 17 -- drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 5 - drivers/infiniband/hw/mlx4/mad.c | 1 drivers/infiniband/hw/mlx5/main.c | 14 + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 drivers/infiniband/hw/mlx5/qp.c | 59 ++---- drivers/infiniband/hw/nes/nes_cm.c | 3 drivers/infiniband/hw/qedr/qedr_cm.c | 10 + drivers/infiniband/hw/qib/qib_rc.c | 4 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 drivers/infiniband/ulp/srp/ib_srp.c | 4 drivers/input/keyboard/tm2-touchkey.c | 2 drivers/input/misc/axp20x-pek.c | 44 ++++- drivers/input/mouse/synaptics.c | 37 +++- drivers/input/touchscreen/silead.c | 3 drivers/md/bitmap.c | 8 - drivers/md/dm-bufio.c | 2 drivers/md/dm-integrity.c | 30 +-- drivers/md/dm-ioctl.c | 5 - drivers/md/dm-raid1.c | 2 drivers/md/dm-snap-persistent.c | 3 drivers/md/dm-verity-target.c | 4 drivers/md/dm.c | 2 drivers/md/md-cluster.c | 4 drivers/md/md.c | 2 drivers/md/raid5-cache.c | 4 drivers/md/raid5-ppl.c | 4 drivers/md/raid5.c | 18 +- .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 8 - .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 8 - .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 8 - drivers/misc/sgi-xp/xp.h | 12 + drivers/misc/sgi-xp/xp_main.c | 36 +--- drivers/mtd/nand/nand_base.c | 46 ++++- drivers/mtd/nand/nand_ids.c | 1 drivers/mtd/nand/nand_samsung.c | 3 drivers/mtd/nand/tango_nand.c | 23 ++ drivers/perf/arm_pmu_acpi.c | 11 + drivers/pinctrl/core.c | 20 -- drivers/pinctrl/freescale/pinctrl-mxs.c | 16 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 24 ++ drivers/pinctrl/pinconf-generic.c | 3 drivers/pinctrl/pinmux.c | 21 -- drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 drivers/scsi/cxgbi/libcxgbi.c | 25 ++- drivers/scsi/cxgbi/libcxgbi.h | 16 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 10 - drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 27 ++- drivers/scsi/qedi/qedi.h | 3 drivers/scsi/qedi/qedi_fw.c | 2 drivers/scsi/qedi/qedi_iscsi.c | 7 + drivers/scsi/qedi/qedi_main.c | 25 +-- drivers/target/iscsi/iscsi_target.c | 30 ++- drivers/target/iscsi/iscsi_target_erl0.c | 6 + drivers/target/iscsi/iscsi_target_erl0.h | 2 drivers/target/iscsi/iscsi_target_login.c | 4 drivers/target/iscsi/iscsi_target_nego.c | 194 ++++++++++++++------ drivers/target/target_core_transport.c | 23 ++ drivers/target/target_core_user.c | 46 +++-- drivers/tty/tty_port.c | 2 fs/dax.c | 23 ++ fs/gfs2/log.c | 2 fs/nfs/flexfilelayout/flexfilelayout.c | 1 fs/nfs/internal.h | 2 fs/nfs/namespace.c | 2 fs/nfs/nfs42proc.c | 2 fs/nfs/nfs4client.c | 1 fs/nfs/pnfs.c | 25 ++- fs/nfs/pnfs.h | 10 + fs/nfs/super.c | 5 - fs/nfsd/nfs3xdr.c | 23 +- fs/nfsd/nfs4proc.c | 13 + fs/nfsd/nfsxdr.c | 13 - fs/ntfs/namei.c | 2 fs/ocfs2/export.c | 2 fs/overlayfs/Kconfig | 1 fs/overlayfs/copy_up.c | 24 ++ fs/overlayfs/dir.c | 61 +++++- fs/overlayfs/inode.c | 12 + fs/overlayfs/namei.c | 16 +- fs/overlayfs/overlayfs.h | 16 +- fs/overlayfs/ovl_entry.h | 2 fs/overlayfs/super.c | 18 ++ fs/overlayfs/util.c | 72 +++++++ fs/proc/base.c | 2 fs/reiserfs/journal.c | 4 fs/ufs/super.c | 5 - fs/xfs/xfs_buf.c | 38 +++- fs/xfs/xfs_buf.h | 5 - include/drm/drm_dp_helper.h | 51 +++++ include/linux/gfp.h | 2 include/linux/gpio/machine.h | 7 + include/linux/jiffies.h | 6 + include/linux/memblock.h | 8 + include/linux/mlx5/mlx5_ifc.h | 10 + include/linux/mm.h | 11 + include/linux/mmzone.h | 1 include/linux/mod_devicetable.h | 1 include/linux/pinctrl/pinconf-generic.h | 3 include/linux/sunrpc/svc.h | 3 include/rdma/ib_sa.h | 25 --- include/rdma/rdma_netlink.h | 10 - include/target/iscsi/iscsi_target_core.h | 1 kernel/livepatch/Kconfig | 1 mm/gup.c | 20 +- mm/hugetlb.c | 5 + mm/ksm.c | 3 mm/memblock.c | 23 ++ mm/memory-failure.c | 8 - mm/memory.c | 40 +++- mm/mlock.c | 5 - mm/page_alloc.c | 37 +++- mm/slub.c | 6 - mm/util.c | 7 + net/sunrpc/xprtrdma/backchannel.c | 6 - net/sunrpc/xprtsock.c | 7 + scripts/gdb/linux/dmesg.py | 9 + sound/pci/hda/patch_realtek.c | 4 sound/usb/mixer_us16x08.c | 19 +- usr/Kconfig | 1 228 files changed, 2050 insertions(+), 1198 deletions(-)