Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 24 Oct 2017 15:16:38 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990754AbdJXNQkyiqAD/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Oct 24 15:16:19 2017 +0200 Commit: 15c6442323226ba4fd2b5cc596473f6a8bfcf7de Gitweb: https://git.linux-mips.org/g/ralf/linux/15c644232322 Branch: master --- .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 8 Documentation/core-api/kernel-api.rst | 14 - .../devicetree/bindings/iio/proximity/as3935.txt | 5 .../bindings/interrupt-controller/arm,gic-v3.txt | 6 Documentation/process/index.rst | 1 .../process/kernel-enforcement-statement.rst | 147 ++++++ MAINTAINERS | 3 Makefile | 2 arch/arm/Makefile | 2 arch/arm/boot/compressed/debug.S | 4 arch/arm/boot/dts/armada-38x.dtsi | 4 arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 arch/arm/boot/dts/at91-sama5d2_xplained.dts | 16 + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 9 arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 arch/arm/boot/dts/bcm283x.dtsi | 7 arch/arm/boot/dts/gemini.dtsi | 3 arch/arm/boot/dts/imx7d.dtsi | 8 arch/arm/boot/dts/moxart.dtsi | 3 arch/arm/boot/dts/sama5d2.dtsi | 1 arch/arm/boot/dts/sun6i-a31.dtsi | 16 - arch/arm/kernel/debug.S | 8 arch/arm/mach-ux500/cpu-db8500.c | 4 arch/arm/mach-ux500/pm.c | 4 arch/arm/mm/nommu.c | 5 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 9 .../boot/dts/marvell/armada-cp110-master.dtsi | 6 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 6 arch/arm64/boot/dts/renesas/salvator-common.dtsi | 10 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 4 arch/parisc/kernel/parisc_ksyms.c | 2 arch/parisc/kernel/syscall.S | 6 arch/parisc/kernel/time.c | 5 arch/s390/configs/zfcpdump_defconfig | 2 arch/s390/kernel/smp.c | 3 arch/x86/include/asm/io.h | 4 arch/x86/include/asm/tlbflush.h | 21 + arch/x86/kernel/cpu/intel_cacheinfo.c | 1 arch/x86/kernel/cpu/microcode/intel.c | 19 + arch/x86/kernel/head32.c | 5 arch/x86/mm/mmap.c | 12 arch/x86/mm/tlb.c | 64 --- crypto/asymmetric_keys/asymmetric_type.c | 4 crypto/asymmetric_keys/pkcs7_parser.c | 3 drivers/android/binder.c | 11 drivers/android/binder_alloc.c | 24 - drivers/android/binder_alloc.h | 1 drivers/block/nbd.c | 2 drivers/block/skd_main.c | 2 drivers/bus/mvebu-mbus.c | 2 drivers/clocksource/cs5535-clockevt.c | 3 drivers/dma/altera-msgdma.c | 4 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 23 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 drivers/gpu/drm/i915/gvt/sched_policy.c | 22 - drivers/gpu/drm/i915/i915_gem.c | 3 drivers/gpu/drm/i915/i915_gem_evict.c | 63 ++ drivers/gpu/drm/i915/i915_reg.h | 1 drivers/gpu/drm/i915/intel_ddi.c | 7 drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 drivers/gpu/drm/i915/intel_engine_cs.c | 9 drivers/gpu/drm/i915/intel_pm.c | 9 drivers/gpu/drm/nouveau/nouveau_fbcon.c | 7 drivers/gpu/drm/nouveau/nv50_display.c | 5 drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 2 drivers/hv/channel_mgmt.c | 5 drivers/i2c/busses/i2c-imx.c | 4 drivers/i2c/busses/i2c-ismt.c | 5 drivers/i2c/busses/i2c-omap.c | 14 + drivers/i2c/busses/i2c-piix4.c | 162 ++++++ drivers/iio/adc/Kconfig | 2 drivers/iio/adc/at91-sama5d2_adc.c | 45 +- drivers/iio/dummy/iio_simple_dummy_events.c | 1 drivers/iio/pressure/zpa2326.c | 10 drivers/iio/proximity/as3935.c | 43 ++ drivers/input/input.c | 84 ++- drivers/input/joydev.c | 70 +++ drivers/input/keyboard/tca8418_keypad.c | 29 + drivers/input/misc/axp20x-pek.c | 2 drivers/input/misc/ims-pcu.c | 16 + drivers/input/mouse/synaptics.c | 3 drivers/input/touchscreen/goodix.c | 67 ++- drivers/input/touchscreen/stmfts.c | 6 drivers/input/touchscreen/ti_am335x_tsc.c | 2 drivers/irqchip/irq-gic-v3-its.c | 43 +- drivers/irqchip/irq-tango.c | 2 drivers/media/cec/cec-adap.c | 13 - drivers/media/dvb-core/dvb_frontend.c | 25 + drivers/media/dvb-frontends/dib3000mc.c | 50 ++ drivers/media/dvb-frontends/dvb-pll.c | 22 + drivers/media/platform/Kconfig | 2 drivers/media/platform/qcom/camss-8x16/camss-vfe.c | 2 drivers/media/platform/qcom/venus/helpers.c | 1 .../media/platform/s5p-cec/exynos_hdmi_cecctrl.c | 3 drivers/media/platform/s5p-cec/s5p_cec.c | 11 drivers/media/platform/s5p-cec/s5p_cec.h | 2 drivers/media/tuners/mt2060.c | 59 ++ drivers/mmc/host/sdhci-pci-core.c | 2 drivers/net/can/flexcan.c | 91 +++- drivers/net/can/usb/esd_usb2.c | 2 drivers/net/can/usb/gs_usb.c | 10 drivers/net/dsa/mv88e6060.c | 10 drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 drivers/net/ethernet/amazon/ena/ena_netdev.c | 7 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 8 .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 157 ++++-- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 5 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 39 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 4 .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 14 - drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 21 - .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 89 ++- .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 3 .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 69 ++- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 18 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 99 +++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 23 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 8 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 11 drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 drivers/net/ethernet/ibm/ibmvnic.c | 16 - drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 63 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 11 drivers/net/ethernet/mellanox/mlxsw/reg.h | 31 + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 11 .../net/ethernet/netronome/nfp/nfp_net_common.c | 20 + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 drivers/net/ethernet/realtek/r8169.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 17 - drivers/net/geneve.c | 6 drivers/net/macsec.c | 2 drivers/net/tun.c | 3 drivers/net/wimax/i2400m/fw.c | 2 .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 3 .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 197 ++++---- drivers/net/wireless/intel/iwlwifi/cfg/7000.c | 1 drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 2 drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 2 drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 2 .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 2 drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 15 + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 16 + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 137 ++--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 7 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 21 + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 2 .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 drivers/net/xen-netback/interface.c | 2 drivers/net/xen-netfront.c | 2 drivers/of/of_mdio.c | 39 +- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 18 + drivers/phy/mediatek/phy-mtk-tphy.c | 3 drivers/phy/rockchip/phy-rockchip-typec.c | 82 ++- drivers/phy/tegra/xusb.c | 2 drivers/pinctrl/pinctrl-amd.c | 10 drivers/pinctrl/pinctrl-mcp23s08.c | 6 drivers/platform/x86/intel_pmc_ipc.c | 115 ++--- drivers/regulator/axp20x-regulator.c | 2 drivers/regulator/rn5t618-regulator.c | 2 drivers/reset/reset-socfpga.c | 17 - drivers/scsi/libfc/fc_rport.c | 2 drivers/scsi/libiscsi.c | 2 drivers/scsi/qla2xxx/qla_os.c | 3 drivers/scsi/scsi_sysfs.c | 10 drivers/scsi/scsi_transport_fc.c | 3 drivers/staging/iio/meter/ade7759.c | 2 drivers/staging/media/imx/imx-media-dev.c | 4 .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 19 - drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/config.c | 6 drivers/usb/core/devio.c | 6 drivers/usb/core/hub.c | 11 drivers/usb/core/quirks.c | 4 drivers/usb/host/xhci-hub.c | 23 + drivers/usb/host/xhci-ring.c | 21 + drivers/usb/host/xhci.c | 3 drivers/usb/musb/musb_core.c | 21 + drivers/usb/musb/musb_core.h | 2 drivers/usb/musb/musb_cppi41.c | 94 +++- drivers/usb/musb/sunxi.c | 2 drivers/usb/serial/metro-usb.c | 1 fs/btrfs/super.c | 2 fs/crypto/keyinfo.c | 5 fs/direct-io.c | 39 +- fs/ecryptfs/ecryptfs_kernel.h | 24 + fs/ecryptfs/keystore.c | 9 fs/exec.c | 1 fs/ext4/super.c | 4 fs/fscache/object-list.c | 7 fs/fuse/inode.c | 2 fs/iomap.c | 41 +- fs/namespace.c | 3 fs/xfs/libxfs/xfs_bmap.c | 11 fs/xfs/libxfs/xfs_bmap.h | 1 fs/xfs/xfs_aops.c | 47 +- fs/xfs/xfs_fsmap.c | 48 +- fs/xfs/xfs_super.c | 2 include/linux/filter.h | 2 include/linux/input.h | 7 include/linux/irq.h | 2 include/linux/irqchip/arm-gic-v3.h | 2 include/linux/key.h | 47 +- include/linux/mbus.h | 4 include/linux/mm_types.h | 3 include/linux/mod_devicetable.h | 3 include/linux/netdevice.h | 3 include/linux/rculist.h | 2 include/linux/rcupdate.h | 22 + include/linux/sched/mm.h | 16 + include/linux/srcu.h | 1 include/net/inet_sock.h | 2 include/net/tcp.h | 5 include/sound/control.h | 3 include/uapi/linux/membarrier.h | 23 + kernel/bpf/arraymap.c | 2 kernel/bpf/devmap.c | 10 kernel/bpf/hashtab.c | 4 kernel/bpf/sockmap.c | 28 + kernel/bpf/verifier.c | 65 ++- kernel/cpu.c | 5 kernel/exit.c | 4 kernel/irq/generic-chip.c | 15 - kernel/rcu/srcutree.c | 2 kernel/rcu/sync.c | 9 kernel/rcu/tree.c | 18 - kernel/sched/membarrier.c | 34 + kernel/workqueue.c | 37 + lib/digsig.c | 6 lib/ts_fsm.c | 2 lib/ts_kmp.c | 2 mm/memcontrol.c | 15 - mm/percpu.c | 15 - net/bridge/br_netlink.c | 2 net/can/af_can.c | 20 + net/can/bcm.c | 5 net/core/dev.c | 6 net/core/dev_ioctl.c | 13 - net/core/ethtool.c | 5 net/core/filter.c | 31 + net/core/rtnetlink.c | 13 - net/core/skbuff.c | 6 net/core/sock.c | 8 net/core/sock_reuseport.c | 12 net/dccp/ipv4.c | 13 - net/dns_resolver/dns_key.c | 2 net/ipv4/Kconfig | 8 net/ipv4/cipso_ipv4.c | 24 - net/ipv4/inet_connection_sock.c | 9 net/ipv4/inet_hashtables.c | 5 net/ipv4/syncookies.c | 2 net/ipv4/tcp_input.c | 2 net/ipv4/tcp_ipv4.c | 22 + net/ipv4/udp.c | 9 net/ipv6/ip6_flowlabel.c | 1 net/ipv6/ip6_output.c | 4 net/l2tp/l2tp_ppp.c | 3 net/mac80211/key.c | 21 + net/ncsi/internal.h | 1 net/ncsi/ncsi-aen.c | 2 net/ncsi/ncsi-manage.c | 52 +- net/ncsi/ncsi-rsp.c | 2 net/netlink/af_netlink.c | 8 net/packet/af_packet.c | 24 + net/rxrpc/af_rxrpc.c | 5 net/sched/cls_flower.c | 2 net/sctp/input.c | 2 net/sctp/socket.c | 4 net/vmw_vsock/hyperv_transport.c | 22 + samples/sockmap/sockmap_kern.c | 2 samples/trace_events/trace-events-sample.c | 14 - security/commoncap.c | 3 security/keys/Kconfig | 1 security/keys/big_key.c | 4 security/keys/encrypted-keys/encrypted.c | 9 security/keys/gc.c | 8 security/keys/key.c | 41 +- security/keys/keyctl.c | 9 security/keys/keyring.c | 14 - security/keys/permission.c | 7 security/keys/proc.c | 31 + security/keys/process_keys.c | 2 security/keys/request_key.c | 7 security/keys/request_key_auth.c | 2 security/keys/trusted.c | 2 security/keys/user_defined.c | 4 sound/core/seq/seq_lock.c | 4 sound/core/seq/seq_lock.h | 12 sound/core/vmaster.c | 31 + sound/hda/hdac_controller.c | 5 sound/pci/hda/hda_codec.c | 97 ++-- sound/usb/quirks.c | 1 tools/include/uapi/linux/bpf.h | 3 tools/objtool/check.c | 9 tools/perf/Documentation/perf-record.txt | 4 .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 9 tools/perf/ui/hist.c | 9 tools/perf/util/parse-events.l | 17 + tools/perf/util/session.c | 2 tools/perf/util/xyarray.h | 4 tools/power/x86/turbostat/turbostat.c | 10 tools/testing/selftests/bpf/bpf_helpers.h | 2 tools/testing/selftests/bpf/sockmap_verdict_prog.c | 4 tools/testing/selftests/bpf/test_maps.c | 12 tools/testing/selftests/bpf/test_verifier.c | 510 ++++++++++++++++++++ 318 files changed, 3712 insertions(+), 1606 deletions(-)