Merge tag 'v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992110AbdFFPueYHOa3/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jun 6 11:47:34 2017 +0200 Commit: 61000fa969d330631e88e153e8a9b1f731c2be85 Gitweb: https://git.linux-mips.org/g/ralf/linux/61000fa969d3 Branch: master --- Documentation/acpi/acpi-lid.txt | 16 Documentation/admin-guide/pm/cpufreq.rst | 19 - Documentation/admin-guide/pm/index.rst | 1 Documentation/admin-guide/pm/intel_pstate.rst | 755 ++++++++++++++++++++ Documentation/cpu-freq/intel-pstate.txt | 281 ------- .../bindings/input/touchscreen/edt-ft5x06.txt | 2 .../devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 2 Documentation/devicetree/bindings/net/fsl-fec.txt | 4 Documentation/input/devices/edt-ft5x06.rst | 2 Documentation/sound/hd-audio/models.rst | 114 ++- MAINTAINERS | 2 Makefile | 2 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 78 ++ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 31 - arch/powerpc/include/uapi/asm/cputable.h | 2 arch/powerpc/kernel/cputable.c | 3 arch/powerpc/kernel/prom.c | 2 arch/powerpc/platforms/cell/spu_base.c | 4 arch/powerpc/platforms/powernv/npu-dma.c | 5 arch/x86/Kconfig | 2 arch/x86/Makefile | 2 arch/x86/boot/compressed/Makefile | 2 arch/x86/entry/entry_32.S | 30 + arch/x86/entry/entry_64.S | 11 arch/x86/include/asm/mce.h | 1 arch/x86/kernel/alternative.c | 9 arch/x86/kernel/cpu/mcheck/mce.c | 13 arch/x86/kernel/ftrace.c | 20 - arch/x86/kernel/kprobes/core.c | 9 arch/x86/kernel/setup.c | 4 arch/x86/kernel/unwind_frame.c | 49 + arch/x86/mm/pageattr.c | 2 arch/x86/mm/pat.c | 9 block/blk-mq.c | 19 - block/blk-sysfs.c | 6 block/blk-throttle.c | 172 +++-- block/partition-generic.c | 4 block/partitions/msdos.c | 2 crypto/skcipher.c | 40 + drivers/acpi/button.c | 9 drivers/acpi/nfit/mce.c | 2 drivers/base/power/wakeup.c | 11 drivers/cpufreq/Kconfig.arm | 9 drivers/cpufreq/Makefile | 2 drivers/firmware/efi/efi-pstore.c | 17 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 7 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 24 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 15 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 15 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 15 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 16 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 32 + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 drivers/gpu/drm/drm_plane.c | 5 drivers/gpu/drm/gma500/psb_intel_lvds.c | 18 drivers/gpu/drm/qxl/qxl_display.c | 4 drivers/gpu/drm/radeon/ci_dpm.c | 6 drivers/gpu/drm/radeon/cik.c | 4 drivers/gpu/drm/radeon/evergreen.c | 4 drivers/gpu/drm/radeon/r600.c | 2 drivers/gpu/drm/radeon/radeon_kms.c | 2 drivers/gpu/drm/radeon/si.c | 4 drivers/i2c/busses/i2c-designware-platdrv.c | 2 drivers/i2c/busses/i2c-tiny-usb.c | 25 + drivers/input/mouse/elan_i2c_i2c.c | 30 - drivers/input/touchscreen/atmel_mxt_ts.c | 1 drivers/input/touchscreen/edt-ft5x06.c | 2 drivers/leds/leds-pca955x.c | 2 drivers/mmc/core/pwrseq_simple.c | 7 drivers/mmc/host/cavium-octeon.c | 15 drivers/mmc/host/cavium-thunderx.c | 6 drivers/mmc/host/cavium.c | 25 - drivers/mmc/host/sdhci-iproc.c | 3 drivers/mmc/host/sdhci-xenon-phy.c | 14 drivers/mmc/host/sdhci-xenon.c | 6 drivers/mmc/host/sdhci-xenon.h | 1 drivers/net/bonding/bond_3ad.c | 2 drivers/net/bonding/bond_main.c | 16 drivers/net/ethernet/8390/ax88796.c | 7 drivers/net/ethernet/atheros/atlx/atl2.c | 8 drivers/net/ethernet/emulex/benet/be_main.c | 4 drivers/net/ethernet/freescale/fec_main.c | 16 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 41 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 8 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 60 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 drivers/net/geneve.c | 8 drivers/net/gtp.c | 2 drivers/net/phy/Kconfig | 2 drivers/net/phy/marvell.c | 66 +- drivers/net/usb/cdc_ether.c | 31 + drivers/net/usb/smsc95xx.c | 13 drivers/net/virtio_net.c | 1 drivers/nvme/host/core.c | 65 +- drivers/nvme/host/fc.c | 147 ++-- drivers/nvme/host/nvme.h | 4 drivers/nvme/host/pci.c | 15 drivers/nvme/host/rdma.c | 20 - drivers/nvme/target/loop.c | 2 drivers/of/platform.c | 3 drivers/pci/dwc/pci-imx6.c | 33 + drivers/pci/endpoint/Kconfig | 1 drivers/pci/pci.c | 3 drivers/pci/switch/switchtec.c | 16 drivers/powercap/powercap_sys.c | 1 drivers/rtc/rtc-cmos.c | 2 drivers/scsi/csiostor/csio_hw.c | 5 drivers/scsi/libfc/fc_rport.c | 2 drivers/scsi/lpfc/lpfc.h | 23 - drivers/scsi/lpfc/lpfc_attr.c | 47 + drivers/scsi/lpfc/lpfc_crtn.h | 11 drivers/scsi/lpfc/lpfc_ct.c | 1 drivers/scsi/lpfc/lpfc_debugfs.c | 69 +- drivers/scsi/lpfc/lpfc_disc.h | 1 drivers/scsi/lpfc/lpfc_els.c | 26 + drivers/scsi/lpfc/lpfc_hbadisc.c | 9 drivers/scsi/lpfc/lpfc_hw4.h | 16 drivers/scsi/lpfc/lpfc_init.c | 137 +--- drivers/scsi/lpfc/lpfc_mem.c | 100 +-- drivers/scsi/lpfc/lpfc_nportdisc.c | 6 drivers/scsi/lpfc/lpfc_nvmet.c | 414 +++++++++-- drivers/scsi/lpfc/lpfc_nvmet.h | 14 drivers/scsi/lpfc/lpfc_sli.c | 357 +++++++-- drivers/scsi/lpfc/lpfc_sli4.h | 19 - drivers/scsi/lpfc/lpfc_version.h | 2 drivers/scsi/scsi_lib.c | 2 drivers/scsi/sd.c | 63 +- drivers/scsi/sg.c | 5 drivers/scsi/ufs/ufshcd.c | 7 drivers/thermal/broadcom/Kconfig | 9 drivers/thermal/qoriq_thermal.c | 3 drivers/thermal/thermal_core.c | 2 drivers/thermal/ti-soc-thermal/ti-bandgap.c | 14 drivers/tty/ehv_bytechan.c | 17 drivers/tty/serdev/core.c | 12 drivers/tty/serdev/serdev-ttyport.c | 21 - drivers/tty/serial/8250/8250_port.c | 21 - drivers/tty/serial/altera_jtaguart.c | 1 drivers/tty/serial/altera_uart.c | 1 drivers/tty/serial/efm32-uart.c | 11 drivers/tty/serial/ifx6x60.c | 2 drivers/tty/serial/imx.c | 14 drivers/tty/serial/serial_core.c | 6 drivers/tty/tty_port.c | 75 ++ fs/ceph/file.c | 6 fs/xfs/libxfs/xfs_bmap.c | 9 fs/xfs/libxfs/xfs_btree.c | 2 fs/xfs/libxfs/xfs_refcount.c | 43 + fs/xfs/xfs_bmap_util.c | 10 fs/xfs/xfs_file.c | 71 +- fs/xfs/xfs_fsmap.c | 5 include/linux/blk-mq.h | 1 include/linux/ceph/ceph_debug.h | 6 include/linux/filter.h | 10 include/linux/if_vlan.h | 18 include/linux/mlx5/device.h | 10 include/linux/mlx5/driver.h | 7 include/linux/netfilter/x_tables.h | 2 include/linux/netfilter_bridge/ebtables.h | 5 include/linux/of_platform.h | 1 include/linux/pci.h | 11 include/linux/ptrace.h | 7 include/linux/serdev.h | 19 - include/linux/tty.h | 9 include/linux/usb/usbnet.h | 1 include/net/dst.h | 8 include/net/ip_fib.h | 10 include/net/netfilter/nf_conntrack_helper.h | 4 include/net/netfilter/nf_tables.h | 2 include/net/tc_act/tc_csum.h | 15 include/net/xfrm.h | 10 kernel/bpf/arraymap.c | 1 kernel/bpf/lpm_trie.c | 1 kernel/bpf/stackmap.c | 1 kernel/bpf/verifier.c | 68 +- kernel/fork.c | 17 kernel/kprobes.c | 2 kernel/locking/rtmutex.c | 24 - kernel/power/snapshot.c | 2 kernel/ptrace.c | 20 - kernel/sched/cpufreq_schedutil.c | 7 kernel/time/posix-cpu-timers.c | 24 - kernel/trace/ftrace.c | 2 lib/test_bpf.c | 38 + net/bridge/br_stp_if.c | 1 net/bridge/br_stp_timer.c | 2 net/bridge/netfilter/ebt_arpreply.c | 3 net/bridge/netfilter/ebtables.c | 9 net/ceph/auth_x.c | 13 net/ceph/ceph_common.c | 13 net/ceph/messenger.c | 26 - net/ceph/mon_client.c | 4 net/ceph/osdmap.c | 1 net/core/dst.c | 23 - net/core/filter.c | 1 net/core/net_namespace.c | 19 + net/core/rtnetlink.c | 7 net/core/sysctl_net_core.c | 2 net/ipv4/arp.c | 56 + net/ipv4/esp4.c | 5 net/ipv4/fib_semantics.c | 17 net/ipv4/route.c | 10 net/ipv4/tcp.c | 11 net/ipv6/ip6_gre.c | 13 net/ipv6/ip6_output.c | 15 net/ipv6/ip6_tunnel.c | 21 - net/key/af_key.c | 2 net/llc/af_llc.c | 3 net/mac80211/rx.c | 3 net/netfilter/ipvs/ip_vs_core.c | 19 - net/netfilter/nf_conntrack_helper.c | 12 net/netfilter/nf_conntrack_netlink.c | 11 net/netfilter/nf_nat_core.c | 4 net/netfilter/nf_tables_api.c | 160 +++- net/netfilter/nfnetlink_cthelper.c | 17 net/netfilter/nft_bitwise.c | 19 - net/netfilter/nft_cmp.c | 12 net/netfilter/nft_ct.c | 4 net/netfilter/nft_immediate.c | 5 net/netfilter/nft_range.c | 4 net/netfilter/nft_set_hash.c | 2 net/netfilter/x_tables.c | 24 - net/netfilter/xt_CT.c | 6 net/openvswitch/conntrack.c | 4 net/sched/cls_matchall.c | 1 net/sctp/associola.c | 4 net/sctp/input.c | 16 net/sctp/sm_make_chunk.c | 13 net/sctp/sm_statefuns.c | 3 net/vmw_vsock/af_vsock.c | 21 - net/wireless/scan.c | 8 net/wireless/util.c | 10 net/xfrm/xfrm_device.c | 2 net/xfrm/xfrm_policy.c | 47 - net/xfrm/xfrm_state.c | 2 sound/pci/hda/patch_realtek.c | 7 sound/pci/hda/patch_sigmatel.c | 2 sound/usb/quirks.c | 2 tools/arch/arm/include/uapi/asm/kvm.h | 10 tools/arch/arm64/include/uapi/asm/kvm.h | 10 tools/arch/powerpc/include/uapi/asm/kvm.h | 3 tools/arch/s390/include/uapi/asm/kvm.h | 26 + tools/arch/x86/include/asm/cpufeatures.h | 2 tools/arch/x86/include/asm/disabled-features.h | 8 tools/arch/x86/include/asm/required-features.h | 8 tools/arch/x86/include/uapi/asm/kvm.h | 3 tools/arch/x86/include/uapi/asm/vmx.h | 25 - tools/include/linux/filter.h | 10 tools/include/uapi/linux/stat.h | 8 tools/perf/Documentation/perf-script.txt | 4 tools/perf/builtin-script.c | 2 tools/perf/ui/hist.c | 2 tools/perf/util/callchain.c | 13 tools/perf/util/evsel_fprintf.c | 33 + tools/perf/util/srcline.c | 49 + tools/perf/util/unwind-libdw.c | 6 tools/perf/util/unwind-libunwind-local.c | 11 tools/power/acpi/.gitignore | 4 tools/testing/selftests/bpf/test_verifier.c | 239 ++++++ .../ftrace/test.d/kprobe/multiple_kprobes.tc | 21 + .../testing/selftests/powerpc/tm/tm-resched-dscr.c | 2 266 files changed, 4089 insertions(+), 1909 deletions(-)