Merge tag 'v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994628AbdGCBIezYTC0/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jul 3 02:26:46 2017 +0200 Commit: 6efe31bb6018187f2e6c01e3036173d8ba10fa1d Gitweb: https://git.linux-mips.org/g/ralf/linux/6efe31bb6018 Branch: master --- Documentation/admin-guide/kernel-parameters.txt | 9 + Documentation/devicetree/bindings/usb/dwc2.txt | 1 MAINTAINERS | 23 +- Makefile | 2 arch/arm/boot/dts/bcm283x.dtsi | 5 arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 4 arch/arm/boot/dts/keystone-k2l.dtsi | 8 + arch/arm/boot/dts/versatile-pb.dts | 2 arch/arm/include/asm/device.h | 3 arch/arm/kvm/init.S | 5 arch/arm/mach-at91/Kconfig | 1 arch/arm/mach-davinci/pm.c | 7 arch/arm/mm/dma-mapping.c | 29 +- arch/arm64/Kconfig | 4 .../boot/dts/marvell/armada-cp110-master.dtsi | 3 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 3 arch/arm64/configs/defconfig | 10 + arch/arm64/include/asm/sysreg.h | 4 arch/arm64/kvm/hyp-init.S | 11 - arch/arm64/kvm/vgic-sys-reg-v3.c | 10 - arch/hexagon/mm/uaccess.c | 5 arch/powerpc/Kconfig | 21 - arch/powerpc/include/asm/book3s/64/hash-4k.h | 2 arch/powerpc/include/asm/cputable.h | 3 arch/powerpc/include/asm/processor.h | 25 +- arch/powerpc/include/asm/topology.h | 14 + arch/powerpc/kernel/dt_cpu_ftrs.c | 58 +++- arch/powerpc/kernel/process.c | 3 arch/powerpc/kernel/setup-common.c | 2 arch/powerpc/kernel/setup_64.c | 4 arch/powerpc/mm/mmu_context_book3s64.c | 2 arch/powerpc/perf/power9-pmu.c | 4 arch/powerpc/platforms/Kconfig | 11 + arch/powerpc/platforms/cell/spufs/coredump.c | 2 arch/powerpc/platforms/powernv/subcore.c | 8 - arch/powerpc/platforms/pseries/hotplug-memory.c | 2 arch/powerpc/sysdev/simple_gpio.c | 3 arch/s390/Kconfig | 3 arch/s390/include/asm/kvm_host.h | 1 arch/s390/kvm/interrupt.c | 4 arch/s390/kvm/kvm-s390.c | 2 arch/sparc/Kconfig | 3 arch/x86/Kconfig | 4 arch/x86/kernel/cpu/cyrix.c | 1 arch/x86/kernel/cpu/microcode/intel.c | 3 arch/x86/kernel/kvm.c | 2 arch/x86/kvm/cpuid.c | 20 + arch/x86/kvm/mmu.c | 7 arch/x86/kvm/mmu.h | 1 arch/x86/kvm/vmx.c | 2 arch/x86/kvm/x86.c | 3 block/bfq-cgroup.c | 116 ++++++-- block/bfq-iosched.c | 2 block/bfq-iosched.h | 23 +- block/bio-integrity.c | 3 block/blk-mq.c | 25 +- block/blk-throttle.c | 22 + crypto/asymmetric_keys/public_key.c | 2 crypto/asymmetric_keys/verify_pefile.c | 4 crypto/asymmetric_keys/x509_cert_parser.c | 1 crypto/drbg.c | 5 crypto/gcm.c | 6 drivers/acpi/arm64/iort.c | 22 + drivers/acpi/battery.c | 2 drivers/acpi/button.c | 5 drivers/acpi/device_pm.c | 3 drivers/acpi/scan.c | 4 drivers/acpi/sleep.c | 28 -- drivers/base/power/main.c | 5 drivers/base/power/wakeup.c | 18 - drivers/block/loop.c | 3 drivers/char/mem.c | 2 drivers/char/random.c | 49 +++ drivers/cpufreq/intel_pstate.c | 5 drivers/dax/super.c | 9 - drivers/firmware/efi/efi-bgrt.c | 26 ++ drivers/firmware/google/vpd.c | 8 - drivers/gpio/gpio-aspeed.c | 3 drivers/gpio/gpio-crystalcove.c | 54 ++-- drivers/gpio/gpio-mvebu.c | 9 + drivers/gpu/drm/drm_atomic_helper.c | 11 + drivers/gpu/drm/drm_drv.c | 7 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 drivers/gpu/drm/i915/i915_drv.c | 9 + drivers/gpu/drm/i915/i915_drv.h | 10 + drivers/gpu/drm/i915/i915_gem.c | 4 drivers/gpu/drm/i915/i915_gem_gtt.c | 106 +++++++ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 drivers/gpu/drm/i915/i915_pci.c | 3 drivers/gpu/drm/i915/intel_display.c | 9 + drivers/gpu/drm/i915/intel_engine_cs.c | 20 + drivers/gpu/drm/i915/intel_fbc.c | 19 - drivers/gpu/drm/i915/intel_pm.c | 9 + drivers/gpu/drm/i915/intel_psr.c | 5 drivers/gpu/drm/i915/intel_sprite.c | 21 + drivers/gpu/drm/i915/intel_uc.h | 2 drivers/gpu/drm/imx/imx-ldb.c | 2 drivers/gpu/drm/mediatek/mtk_dsi.c | 15 - drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 drivers/gpu/drm/meson/meson_drv.c | 20 + .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 drivers/gpu/drm/nouveau/nouveau_drm.c | 38 +-- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 drivers/gpu/drm/nouveau/nouveau_vga.c | 13 - drivers/gpu/drm/nouveau/nv50_display.c | 3 drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 7 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 12 - drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 115 -------- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 15 - drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 23 +- drivers/gpu/ipu-v3/ipu-common.c | 15 + drivers/gpu/ipu-v3/ipu-pre.c | 13 - drivers/iio/adc/bcm_iproc_adc.c | 8 - drivers/iio/adc/max9611.c | 10 - drivers/iio/adc/sun4i-gpadc-iio.c | 38 ++- drivers/iio/adc/ti_am335x_adc.c | 2 drivers/iio/industrialio-trigger.c | 3 drivers/iio/light/ltr501.c | 4 drivers/iio/proximity/as3935.c | 14 - drivers/input/mouse/elantech.c | 16 + drivers/input/rmi4/rmi_f03.c | 2 drivers/iommu/of_iommu.c | 7 drivers/md/md.c | 16 + drivers/md/md.h | 1 drivers/md/raid1.c | 2 drivers/md/raid10.c | 3 drivers/md/raid5.c | 3 drivers/memory/atmel-ebi.c | 2 drivers/misc/cxl/file.c | 7 drivers/misc/cxl/native.c | 14 + drivers/misc/mei/bus.c | 4 drivers/nvme/host/core.c | 21 + drivers/nvme/host/fc.c | 20 + drivers/nvme/host/pci.c | 13 - drivers/nvme/host/rdma.c | 44 ++- drivers/of/device.c | 4 drivers/phy/phy-qcom-qmp.c | 14 - drivers/platform/goldfish/goldfish_pipe.c | 2 drivers/reset/hisilicon/hi6220_reset.c | 2 drivers/scsi/bnx2fc/bnx2fc.h | 1 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 10 + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 drivers/scsi/cxgbi/libcxgbi.c | 29 +- drivers/scsi/cxgbi/libcxgbi.h | 1 drivers/scsi/lpfc/lpfc_crtn.h | 2 drivers/scsi/lpfc/lpfc_ct.c | 5 drivers/scsi/lpfc/lpfc_nportdisc.c | 7 drivers/scsi/lpfc/lpfc_nvmet.c | 4 drivers/scsi/qla2xxx/qla_bsg.c | 9 - drivers/scsi/qla2xxx/qla_dbg.c | 4 drivers/scsi/qla2xxx/qla_def.h | 1 drivers/scsi/qla2xxx/qla_init.c | 5 drivers/scsi/qla2xxx/qla_inline.h | 26 -- drivers/scsi/qla2xxx/qla_isr.c | 2 drivers/scsi/qla2xxx/qla_mbx.c | 13 - drivers/scsi/qla2xxx/qla_os.c | 46 ++- drivers/scsi/qla2xxx/qla_target.c | 8 - drivers/scsi/qla2xxx/qla_tmpl.c | 2 drivers/scsi/scsi_debug.c | 2 drivers/staging/ccree/Kconfig | 2 drivers/staging/ccree/ssi_buffer_mgr.c | 3 drivers/staging/lustre/lustre/lov/lov_pack.c | 9 - drivers/usb/chipidea/core.c | 5 drivers/usb/chipidea/debug.c | 3 drivers/usb/chipidea/udc.c | 8 - drivers/usb/chipidea/usbmisc_imx.c | 41 ++- drivers/usb/dwc2/params.c | 2 drivers/usb/gadget/function/f_mass_storage.c | 13 + drivers/usb/gadget/udc/renesas_usb3.c | 45 ++- drivers/usb/musb/musb_dsps.c | 5 drivers/xen/privcmd.c | 4 fs/btrfs/ctree.h | 4 fs/btrfs/dir-item.c | 2 fs/btrfs/disk-io.c | 10 - fs/btrfs/extent-tree.c | 7 fs/btrfs/extent_io.c | 126 ++++++++ fs/btrfs/inode.c | 6 fs/ext4/acl.c | 4 fs/ext4/ext4.h | 2 fs/ext4/extents.c | 85 +++--- fs/ext4/file.c | 54 +--- fs/ext4/inline.c | 5 fs/ext4/inode.c | 30 +- fs/ext4/mballoc.c | 23 +- fs/ext4/namei.c | 13 - fs/ext4/super.c | 17 + fs/ext4/xattr.c | 8 + fs/jbd2/transaction.c | 6 fs/quota/dquot.c | 16 + fs/stat.c | 1 fs/ufs/balloc.c | 26 ++ fs/ufs/inode.c | 28 +- fs/ufs/super.c | 18 + fs/ufs/util.h | 10 - include/linux/compiler-clang.h | 3 include/linux/dma-iommu.h | 1 include/linux/elevator.h | 2 include/linux/irqchip/arm-gic-v3.h | 4 include/linux/irqchip/arm-gic.h | 28 ++ include/linux/key.h | 1 include/linux/quotaops.h | 6 include/linux/srcu.h | 2 include/linux/suspend.h | 7 include/uapi/linux/keyctl.h | 4 kernel/cpu.c | 4 kernel/events/core.c | 21 + kernel/power/process.c | 2 kernel/power/suspend.c | 29 -- kernel/printk/printk.c | 46 +-- kernel/rcu/srcu.c | 5 kernel/rcu/srcutiny.c | 7 kernel/rcu/srcutree.c | 5 security/keys/Kconfig | 6 security/keys/dh.c | 300 ++++++++++++-------- security/keys/encrypted-keys/encrypted.c | 204 +++++--------- security/keys/gc.c | 4 security/keys/key.c | 16 - security/keys/keyctl.c | 16 + security/keys/keyring.c | 12 - security/keys/process_keys.c | 7 security/keys/trusted.c | 50 +-- security/keys/user_defined.c | 16 + sound/core/timer.c | 7 sound/pci/hda/patch_realtek.c | 11 - sound/soc/atmel/atmel-classd.c | 9 + sound/soc/codecs/da7213.c | 2 sound/soc/codecs/rt286.c | 7 sound/soc/generic/simple-card.c | 2 sound/soc/intel/skylake/skl-sst-ipc.c | 5 sound/soc/intel/skylake/skl-topology.c | 2 sound/soc/intel/skylake/skl.c | 162 ++++++----- sound/soc/intel/skylake/skl.h | 4 sound/soc/sh/rcar/adg.c | 6 sound/soc/sh/rcar/cmd.c | 1 sound/soc/sh/rcar/core.c | 51 +++ sound/soc/sh/rcar/gen.c | 1 sound/soc/sh/rcar/rsnd.h | 2 sound/soc/sh/rcar/src.c | 12 + sound/soc/sh/rcar/ssi.c | 18 + sound/soc/sh/rcar/ssiu.c | 3 sound/soc/soc-core.c | 5 tools/perf/Documentation/perf-probe.txt | 8 - tools/perf/Documentation/perf-script-perl.txt | 2 tools/perf/Documentation/perf-script-python.txt | 23 +- tools/perf/arch/common.c | 1 tools/perf/builtin-stat.c | 5 tools/perf/builtin-trace.c | 4 tools/perf/tests/bp_signal.c | 14 + tools/perf/tests/builtin-test.c | 7 tools/perf/tests/code-reading.c | 20 + tools/perf/tests/tests.h | 3 tools/perf/util/annotate.c | 72 +++-- tools/perf/util/build-id.c | 45 --- tools/perf/util/build-id.h | 1 tools/perf/util/dso.c | 100 ++++++- tools/perf/util/dso.h | 9 + tools/perf/util/header.c | 12 + tools/perf/util/machine.c | 11 - .../util/scripting-engines/trace-event-python.c | 2 tools/perf/util/symbol-elf.c | 41 --- tools/perf/util/symbol.c | 4 tools/perf/util/unwind-libdw.c | 10 + virt/kvm/arm/hyp/vgic-v3-sr.c | 2 virt/kvm/arm/mmu.c | 3 virt/kvm/arm/vgic/vgic-mmio-v2.c | 16 + virt/kvm/arm/vgic/vgic-v2.c | 28 ++ virt/kvm/arm/vgic/vgic-v3.c | 47 ++- virt/kvm/arm/vgic/vgic.h | 12 + 275 files changed, 2558 insertions(+), 1581 deletions(-)