Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992544AbdHGH7mmCORy/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jul 18 22:11:57 2017 +0200 Commit: 8abe22dc91809a07b3a0cc132479ca96ee00fbaa Gitweb: https://git.linux-mips.org/g/ralf/linux/8abe22dc9180 Branch: master --- MAINTAINERS | 8 arch/blackfin/include/asm/flat.h | 3 arch/blackfin/kernel/flat.c | 4 arch/h8300/include/asm/flat.h | 2 arch/m68k/include/asm/flat.h | 3 arch/sparc/include/asm/trap_block.h | 1 arch/sparc/kernel/pci_sun4v.c | 12 - arch/sparc/kernel/smp_64.c | 185 +++++---- arch/sparc/kernel/sun4v_ivec.S | 15 + arch/sparc/kernel/traps_64.c | 1 drivers/base/regmap/regmap-w1.c | 4 drivers/infiniband/core/addr.c | 46 ++ drivers/infiniband/core/cma.c | 32 -- drivers/infiniband/core/roce_gid_mgmt.c | 11 - drivers/infiniband/core/uverbs_cmd.c | 23 - drivers/infiniband/core/verbs.c | 51 ++ drivers/infiniband/hw/hfi1/chip.c | 7 drivers/infiniband/hw/hfi1/qp.c | 7 drivers/infiniband/hw/hfi1/qp.h | 3 drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 86 +++- drivers/infiniband/hw/hns/hns_roce_main.c | 3 drivers/infiniband/hw/mlx4/cq.c | 6 drivers/infiniband/hw/mlx4/main.c | 2 drivers/infiniband/hw/mlx4/mcg.c | 2 drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 drivers/infiniband/hw/mlx4/qp.c | 40 +- drivers/infiniband/hw/mlx4/srq.c | 8 drivers/infiniband/hw/mlx5/mr.c | 36 +- drivers/infiniband/hw/nes/nes_hw.c | 4 drivers/infiniband/hw/qib/qib_qp.c | 15 - drivers/infiniband/hw/qib/qib_verbs.h | 4 drivers/infiniband/sw/rdmavt/qp.c | 48 +- drivers/infiniband/sw/rxe/rxe_net.c | 3 drivers/infiniband/sw/rxe/rxe_verbs.c | 2 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 20 - drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 + drivers/infiniband/ulp/iser/iscsi_iser.c | 11 + drivers/infiniband/ulp/iser/iser_verbs.c | 10 drivers/md/bitmap.c | 3 drivers/md/md.h | 4 drivers/md/raid5-ppl.c | 2 drivers/md/raid5.c | 4 drivers/net/ethernet/mellanox/mlx4/alloc.c | 29 + drivers/net/ethernet/mellanox/mlx4/cq.c | 4 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 drivers/net/ethernet/mellanox/mlx4/icm.c | 7 drivers/net/ethernet/mellanox/mlx4/icm.h | 3 drivers/net/ethernet/mellanox/mlx4/mlx4.h | 4 drivers/net/ethernet/mellanox/mlx4/mr.c | 17 - drivers/net/ethernet/mellanox/mlx4/qp.c | 20 - .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 drivers/net/ethernet/mellanox/mlx4/srq.c | 4 drivers/scsi/cxlflash/main.c | 11 - drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 10 drivers/scsi/isci/request.c | 14 - drivers/scsi/libfc/fc_disc.c | 2 drivers/scsi/qedf/qedf_main.c | 2 drivers/scsi/qedi/qedi.h | 17 + drivers/scsi/qedi/qedi_fw.c | 2 drivers/scsi/qedi/qedi_main.c | 419 ++++++++++++++++++++ drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h | 210 ++++++++++ drivers/scsi/qla2xxx/qla_target.c | 2 drivers/scsi/sg.c | 5 drivers/scsi/virtio_scsi.c | 1 fs/binfmt_flat.c | 2 fs/nfsd/nfs4callback.c | 6 include/linux/mlx4/device.h | 10 include/rdma/ib_verbs.h | 18 + include/rdma/rdma_vt.h | 5 kernel/cpu.c | 3 kernel/irq/manage.c | 63 +++ 73 files changed, 1252 insertions(+), 416 deletions(-)