Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 31 Aug 2018 03:44:00 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994615AbeHaBoJI4ME2/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 01:56:28 2018 +0200 Commit: c9bace5bce3ea330dec7696e4bf54b2f48b5cba8 Gitweb: https://git.linux-mips.org/g/ralf/linux/c9bace5bce3e Branch: master --- Documentation/ABI/testing/sysfs-driver-xen-blkback | 10 + .../interrupt-controller/riscv,cpu-intc.txt | 14 + Documentation/hwmon/ina2xx | 2 MAINTAINERS | 8 - arch/arm64/crypto/ghash-ce-glue.c | 29 ++- arch/arm64/crypto/sm4-ce-glue.c | 2 arch/nios2/Kconfig.debug | 9 - arch/powerpc/Kconfig | 1 arch/riscv/include/asm/tlb.h | 4 arch/riscv/kernel/sys_riscv.c | 15 -- arch/x86/crypto/aesni-intel_asm.S | 66 ++++--- block/blk-wbt.c | 89 +++++++--- block/bsg.c | 8 - block/elevator.c | 3 drivers/ata/pata_ftide010.c | 27 ++- drivers/block/xen-blkback/blkback.c | 99 ++++++----- drivers/block/xen-blkback/common.h | 14 - drivers/block/xen-blkfront.c | 110 ++++++++++-- drivers/bluetooth/Kconfig | 1 drivers/bluetooth/btmtkuart.c | 8 + drivers/cdrom/cdrom.c | 2 drivers/crypto/caam/caamalg_qi.c | 6 - drivers/crypto/caam/caampkc.c | 20 +- drivers/crypto/caam/jr.c | 3 drivers/crypto/cavium/nitrox/nitrox_dev.h | 3 drivers/crypto/cavium/nitrox/nitrox_lib.c | 1 drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 57 +++--- drivers/crypto/chelsio/chtls/chtls.h | 5 + drivers/crypto/chelsio/chtls/chtls_main.c | 7 + drivers/crypto/vmx/aes_cbc.c | 30 +-- drivers/crypto/vmx/aes_xts.c | 21 +- drivers/hwmon/adt7475.c | 25 ++- drivers/hwmon/ina2xx.c | 13 + drivers/hwmon/nct6775.c | 2 drivers/mmc/core/queue.c | 12 + drivers/mmc/core/queue.h | 1 drivers/mmc/host/android-goldfish.c | 4 drivers/mmc/host/atmel-mci.c | 12 + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 10 + drivers/mtd/nand/raw/denali.c | 5 + drivers/mtd/nand/raw/docg4.c | 4 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 6 - drivers/net/ethernet/cadence/macb_main.c | 36 ++-- .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 10 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 5 - drivers/net/ethernet/hisilicon/hns/hnae.h | 6 - drivers/net/ethernet/hisilicon/hns/hns_enet.c | 108 ------------ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 - drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 7 - drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +- drivers/net/ethernet/intel/ice/ice.h | 15 +- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 25 +-- drivers/net/ethernet/intel/ice/ice_common.c | 30 ++- drivers/net/ethernet/intel/ice/ice_controlq.c | 29 ++- drivers/net/ethernet/intel/ice/ice_ethtool.c | 52 ++++-- drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 8 - drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 1 drivers/net/ethernet/intel/ice/ice_main.c | 115 +++++++----- drivers/net/ethernet/intel/ice/ice_nvm.c | 5 - drivers/net/ethernet/intel/ice/ice_sched.c | 3 drivers/net/ethernet/intel/ice/ice_switch.c | 4 drivers/net/ethernet/intel/ice/ice_switch.h | 6 - drivers/net/ethernet/intel/ice/ice_txrx.h | 2 drivers/net/ethernet/intel/ice/ice_type.h | 16 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 drivers/net/ethernet/intel/igb/igb_main.c | 7 - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 - drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 4 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 36 +++- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 31 +++ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 19 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 3 drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 6 - .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 11 + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 20 ++ drivers/net/ethernet/netronome/nfp/flower/action.c | 6 - drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 187 +++++++++++++++++--- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 27 ++- drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 2 drivers/net/ethernet/qlogic/qede/qede_filter.c | 6 - drivers/net/ethernet/qlogic/qlge/qlge_main.c | 23 +- drivers/net/ethernet/renesas/ravb.h | 5 - drivers/net/ethernet/renesas/ravb_main.c | 5 - drivers/net/ethernet/renesas/sh_eth.c | 13 - drivers/net/ethernet/renesas/sh_eth.h | 13 - drivers/net/ethernet/stmicro/stmmac/Kconfig | 10 + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 5 - drivers/net/hyperv/netvsc_drv.c | 5 + drivers/net/usb/r8152.c | 4 drivers/nvme/host/pci.c | 8 + drivers/nvme/target/core.c | 4 drivers/nvme/target/fcloop.c | 3 drivers/thermal/of-thermal.c | 7 + drivers/thermal/qoriq_thermal.c | 27 +-- drivers/thermal/rcar_gen3_thermal.c | 11 - drivers/thermal/rcar_thermal.c | 16 -- drivers/vhost/vhost.c | 2 fs/isofs/inode.c | 7 + fs/notify/mark.c | 6 - fs/quota/quota.c | 14 + fs/udf/super.c | 93 ++-------- include/linux/platform_data/ina2xx.h | 2 include/linux/quota.h | 8 - include/net/act_api.h | 7 - include/net/pkt_cls.h | 25 +-- kernel/bpf/hashtab.c | 23 +- kernel/bpf/sockmap.c | 11 + lib/rhashtable.c | 1 net/dsa/slave.c | 4 net/ipv4/tcp_bbr.c | 42 +++- net/ipv4/tcp_ipv4.c | 6 + net/ipv6/addrconf.c | 6 - net/ipv6/ip6_fib.c | 2 net/ipv6/ip6_vti.c | 3 net/ipv6/route.c | 2 net/ncsi/ncsi-netlink.c | 4 net/rds/tcp.c | 1 net/sched/act_api.c | 70 +++---- net/sched/act_bpf.c | 8 - net/sched/act_connmark.c | 8 - net/sched/act_csum.c | 8 - net/sched/act_gact.c | 8 - net/sched/act_ife.c | 92 ++++------ net/sched/act_ipt.c | 16 -- net/sched/act_mirred.c | 8 - net/sched/act_nat.c | 8 - net/sched/act_pedit.c | 8 - net/sched/act_police.c | 8 - net/sched/act_sample.c | 8 - net/sched/act_simple.c | 8 - net/sched/act_skbedit.c | 8 - net/sched/act_skbmod.c | 8 - net/sched/act_tunnel_key.c | 8 - net/sched/act_vlan.c | 8 - net/sched/cls_u32.c | 10 + net/sched/sch_cake.c | 24 ++- net/tls/tls_main.c | 9 + net/xdp/xdp_umem.c | 4 tools/bpf/bpftool/map_perf_ring.c | 5 - 144 files changed, 1305 insertions(+), 1119 deletions(-)