Merge tag 'v4.12.4' 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:20 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994881AbdIVIWYN5BHV/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Sep 21 00:17:52 2017 +0200 Commit: 6e5d89ca50c0d2b0b159470fd20cf9b38122498c Gitweb: https://git.linux-mips.org/g/ralf/linux/6e5d89ca50c0 Branch: linux-4.12-stable --- Makefile | 5 + arch/mips/include/asm/branch.h | 5 - arch/mips/kernel/branch.c | 71 ++++----- arch/mips/kernel/ptrace.c | 2 arch/mips/kernel/scall32-o32.S | 2 arch/mips/kernel/scall64-64.S | 2 arch/mips/kernel/scall64-n32.S | 2 arch/mips/kernel/scall64-o32.S | 2 arch/mips/kernel/syscall.c | 15 ++ arch/mips/math-emu/cp1emu.c | 38 +++++ arch/powerpc/include/asm/atomic.h | 4 - arch/powerpc/include/asm/reg.h | 2 arch/powerpc/lib/sstep.c | 19 ++ arch/powerpc/mm/mmu_context_book3s64.c | 12 +- arch/powerpc/mm/pgtable-radix.c | 15 ++ arch/powerpc/perf/isa207-common.c | 6 + arch/powerpc/platforms/pseries/lpar.c | 11 + arch/s390/include/asm/syscall.h | 6 + arch/x86/include/asm/xen/hypercall.h | 9 + arch/x86/kernel/acpi/boot.c | 8 + arch/x86/kernel/apic/io_apic.c | 2 arch/x86/pci/fixup.c | 32 ++++ arch/x86/xen/smp_pv.c | 3 drivers/acpi/ec.c | 21 --- drivers/acpi/nfit/core.c | 10 + drivers/base/power/domain.c | 20 +-- drivers/char/ipmi/ipmi_msghandler.c | 5 + drivers/char/ipmi/ipmi_ssif.c | 5 + drivers/cpufreq/intel_pstate.c | 21 ++- drivers/dax/device-dax.h | 2 drivers/dax/device.c | 24 ++- drivers/dax/pmem.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 --------- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 6 + drivers/gpu/drm/drm_dp_mst_topology.c | 41 ++++- drivers/gpu/drm/drm_framebuffer.c | 1 drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 + drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 drivers/gpu/drm/i915/i915_drv.c | 8 + drivers/gpu/drm/i915/i915_perf.c | 12 +- drivers/gpu/drm/i915/intel_cdclk.c | 20 +++ drivers/gpu/drm/i915/intel_fbdev.c | 11 + drivers/gpu/drm/imx/parallel-display.c | 2 drivers/gpu/drm/radeon/atombios_encoders.c | 13 +- drivers/gpu/drm/radeon/ci_dpm.c | 6 + drivers/gpu/drm/ttm/ttm_bo.c | 4 - drivers/hid/hid-multitouch.c | 16 +- drivers/hv/channel.c | 2 drivers/infiniband/core/addr.c | 6 + drivers/infiniband/core/cma.c | 2 drivers/infiniband/core/uverbs_cmd.c | 3 drivers/infiniband/hw/mlx5/mr.c | 2 drivers/infiniband/ulp/iser/iscsi_iser.c | 11 + drivers/infiniband/ulp/isert/ib_isert.c | 2 drivers/input/serio/i8042.c | 12 +- drivers/iommu/arm-smmu.c | 16 ++ drivers/md/dm-raid.c | 13 +- drivers/md/faulty.c | 5 - drivers/md/linear.c | 7 + drivers/md/md.c | 22 ++- drivers/md/md.h | 4 - drivers/md/multipath.c | 8 + drivers/md/raid0.c | 7 + drivers/md/raid1.c | 16 +- drivers/md/raid10.c | 10 + drivers/md/raid5.c | 26 ++- drivers/media/pci/cx88/cx88-cards.c | 9 + drivers/media/pci/cx88/cx88-video.c | 2 drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 + drivers/media/rc/imon.c | 2 drivers/media/rc/rc-main.c | 20 +-- drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 - drivers/media/usb/dvb-usb-v2/mxl111sf.c | 32 ++-- drivers/media/usb/dvb-usb-v2/mxl111sf.h | 8 + drivers/misc/enclosure.c | 14 +- drivers/mtd/nand/tango_nand.c | 2 drivers/net/ethernet/intel/igb/e1000_82575.c | 1 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 drivers/net/wireless/ath/ath9k/rng.c | 4 - drivers/net/wireless/ath/ath9k/tx99.c | 13 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 32 +++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 71 ++++----- drivers/net/wireless/ti/wlcore/spi.c | 6 - drivers/nfc/nfcmrvl/fw_dnld.c | 7 + drivers/nfc/nfcmrvl/main.c | 35 +++- drivers/nfc/nfcmrvl/uart.c | 8 + drivers/nvdimm/btt.c | 9 + drivers/nvdimm/claim.c | 3 drivers/nvdimm/core.c | 7 + drivers/nvme/host/rdma.c | 20 +-- drivers/pci/host/pcie-rockchip.c | 13 +- drivers/pci/host/vmd.c | 2 drivers/pci/msi.c | 14 -- drivers/pci/pci-driver.c | 1 drivers/scsi/qla2xxx/qla_init.c | 7 + drivers/scsi/scsi_lib.c | 47 ++++-- drivers/scsi/scsi_scan.c | 5 - drivers/scsi/scsi_sysfs.c | 8 + drivers/scsi/virtio_scsi.c | 13 ++ drivers/spi/spi-atmel.c | 24 +++ drivers/spmi/spmi.c | 12 ++ drivers/staging/comedi/drivers/ni_mio_common.c | 3 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 19 ++ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 drivers/staging/sm750fb/sm750.c | 24 +++ drivers/target/iscsi/iscsi_target_configfs.c | 2 drivers/target/iscsi/iscsi_target_nego.c | 6 + drivers/target/iscsi/iscsi_target_parameters.c | 41 ++++- drivers/target/iscsi/iscsi_target_parameters.h | 2 drivers/target/iscsi/iscsi_target_tpg.c | 19 ++ drivers/target/iscsi/iscsi_target_tpg.h | 1 drivers/target/target_core_transport.c | 9 + drivers/thermal/cpu_cooling.c | 4 - drivers/thermal/max77620_thermal.c | 10 + drivers/tty/serial/sh-sci.c | 12 +- drivers/tty/serial/st-asc.c | 1 drivers/usb/class/cdc-acm.c | 3 drivers/usb/host/pci-quirks.c | 54 +++++++ drivers/usb/host/pci-quirks.h | 2 drivers/usb/host/xhci-hub.c | 5 + drivers/usb/host/xhci-pci.c | 6 + drivers/usb/host/xhci-ring.c | 11 + drivers/usb/host/xhci.c | 10 + drivers/usb/host/xhci.h | 1 drivers/usb/renesas_usbhs/common.c | 4 - drivers/usb/renesas_usbhs/mod_gadget.c | 31 +++- drivers/usb/storage/isd200.c | 5 + drivers/vfio/vfio.c | 84 ++++++----- drivers/xen/xen-scsiback.c | 33 +--- fs/btrfs/acl.c | 13 +- fs/btrfs/disk-io.c | 12 +- fs/btrfs/extent_io.c | 6 - fs/btrfs/file.c | 5 + fs/btrfs/inode.c | 8 + fs/btrfs/send.c | 7 + fs/ceph/dir.c | 5 + fs/cifs/cifsglob.h | 2 fs/cifs/cifssmb.c | 7 + fs/cifs/connect.c | 7 + fs/cifs/smb2ops.c | 23 +++ fs/ext2/acl.c | 36 +++-- fs/f2fs/acl.c | 2 fs/f2fs/checkpoint.c | 11 + fs/f2fs/f2fs.h | 18 ++ fs/f2fs/file.c | 1 fs/f2fs/gc.c | 9 + fs/f2fs/inode.c | 2 fs/f2fs/segment.c | 37 +++-- fs/f2fs/super.c | 16 ++ fs/fs-writeback.c | 8 + fs/hfsplus/posix_acl.c | 30 ++-- fs/nfs/dir.c | 12 +- fs/nfs/filelayout/filelayout.c | 3 fs/nfs/inode.c | 4 - fs/nfs/pagelist.c | 1 fs/overlayfs/dir.c | 22 ++- fs/overlayfs/super.c | 1 fs/pstore/platform.c | 5 + fs/reiserfs/xattr_acl.c | 12 +- fs/ubifs/dir.c | 1 fs/ubifs/journal.c | 12 +- fs/ubifs/tnc.c | 2 fs/ubifs/ubifs.h | 1 fs/ubifs/xattr.c | 22 +++ fs/udf/file.c | 9 + fs/udf/inode.c | 4 - fs/xfs/xfs_acl.c | 6 - fs/xfs/xfs_acl.h | 1 fs/xfs/xfs_iops.c | 4 - fs/xfs/xfs_mount.c | 4 - include/linux/backing-dev.h | 26 --- include/linux/blk-cgroup.h | 6 - include/linux/init_task.h | 6 - include/linux/interrupt.h | 4 - include/linux/mman.h | 2 include/linux/percpu_counter.h | 7 + include/linux/sched.h | 29 ++-- include/linux/vfio.h | 2 include/linux/vtime.h | 9 - include/net/inet_frag.h | 4 - include/scsi/scsi_cmnd.h | 1 include/scsi/scsi_device.h | 1 include/target/iscsi/iscsi_target_core.h | 9 + kernel/cpu.c | 38 +++-- kernel/events/core.c | 28 +--- kernel/fork.c | 22 +-- kernel/irq/affinity.c | 13 ++ kernel/sched/cputime.c | 158 ++++++++++++-------- kernel/sched/fair.c | 32 +++- kernel/time/alarmtimer.c | 2 kernel/trace/ftrace.c | 2 kernel/trace/trace.c | 1 lib/flex_proportions.c | 6 - lib/percpu_counter.c | 11 + mm/page-writeback.c | 10 + net/bluetooth/smp.c | 39 +++-- net/nfc/core.c | 31 ++-- net/nfc/llcp_sock.c | 9 + net/nfc/nci/core.c | 3 net/nfc/netlink.c | 4 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 net/sunrpc/xprtsock.c | 2 sound/soc/atmel/tse850-pcm5142.c | 4 - sound/soc/soc-compress.c | 6 + sound/soc/zte/zx-i2s.c | 10 + tools/perf/ui/browser.c | 2 .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 78 ++++++++-- tools/testing/nvdimm/test/nfit.c | 2 virt/kvm/vfio.c | 27 ++- 216 files changed, 1788 insertions(+), 950 deletions(-)