Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (cd02217a) · Commits · EulixOS / Software / Kernel

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		@@ -178,6 +179,7 @@ Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
		Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
		Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

MAINTAINERS

+29 −29

Original line number	Diff line number	Diff line
		@@ -5050,7 +5050,7 @@ F: include/linux/dm-*.h
		F: include/uapi/linux/dm-*.h

		DEVLINK
		M: Jiri Pirko <jiri@mellanox.com>
		M: Jiri Pirko <jiri@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: Documentation/networking/devlink
		@@ -6081,7 +6081,7 @@ F: include/linux/dynamic_debug.h
		F: lib/dynamic_debug.c

		DYNAMIC INTERRUPT MODERATION
		M: Tal Gilboa <talgi@mellanox.com>
		M: Tal Gilboa <talgi@nvidia.com>
		S: Maintained
		F: Documentation/networking/net_dim.rst
		F: include/linux/dim.h
		@@ -6161,7 +6161,7 @@ F: Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
		F: drivers/edac/aspeed_edac.c

		EDAC-BLUEFIELD
		M: Shravan Kumar Ramani <sramani@mellanox.com>
		M: Shravan Kumar Ramani <sramani@nvidia.com>
		S: Supported
		F: drivers/edac/bluefield_edac.c

		@@ -6483,8 +6483,8 @@ S: Odd Fixes
		F: drivers/net/ethernet/agere/

		ETHERNET BRIDGE
		M: Roopa Prabhu <roopa@cumulusnetworks.com>
		M: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
		M: Roopa Prabhu <roopa@nvidia.com>
		M: Nikolay Aleksandrov <nikolay@nvidia.com>
		L: bridge@lists.linux-foundation.org (moderated for non-subscribers)
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -6599,7 +6599,7 @@ F: drivers/iommu/exynos-iommu.c

		EZchip NPS platform support
		M: Vineet Gupta <vgupta@synopsys.com>
		M: Ofer Levi <oferle@mellanox.com>
		M: Ofer Levi <oferle@nvidia.com>
		S: Supported
		F: arch/arc/boot/dts/eznps.dts
		F: arch/arc/plat-eznps
		@@ -8563,7 +8563,7 @@ F: drivers/iio/pressure/dps310.c

		INFINIBAND SUBSYSTEM
		M: Doug Ledford <dledford@redhat.com>
		M: Jason Gunthorpe <jgg@mellanox.com>
		M: Jason Gunthorpe <jgg@nvidia.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		W: https://github.com/linux-rdma/rdma-core
		@@ -9226,7 +9226,7 @@ F: drivers/firmware/iscsi_ibft*

		ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
		M: Sagi Grimberg <sagi@grimberg.me>
		M: Max Gurtovoy <maxg@mellanox.com>
		M: Max Gurtovoy <maxg@nvidia.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		W: http://www.openfabrics.org
		@@ -11072,7 +11072,7 @@ F: Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
		F: drivers/input/touchscreen/melfas_mip4.c

		MELLANOX ETHERNET DRIVER (mlx4_en)
		M: Tariq Toukan <tariqt@mellanox.com>
		M: Tariq Toukan <tariqt@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11080,7 +11080,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/
		F: drivers/net/ethernet/mellanox/mlx4/en_*

		MELLANOX ETHERNET DRIVER (mlx5e)
		M: Saeed Mahameed <saeedm@mellanox.com>
		M: Saeed Mahameed <saeedm@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11088,7 +11088,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/
		F: drivers/net/ethernet/mellanox/mlx5/core/en_*

		MELLANOX ETHERNET INNOVA DRIVERS
		R: Boris Pismenny <borisp@mellanox.com>
		R: Boris Pismenny <borisp@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11099,8 +11099,8 @@ F: drivers/net/ethernet/mellanox/mlx5/core/fpga/*
		F: include/linux/mlx5/mlx5_ifc_fpga.h

		MELLANOX ETHERNET SWITCH DRIVERS
		M: Jiri Pirko <jiri@mellanox.com>
		M: Ido Schimmel <idosch@mellanox.com>
		M: Jiri Pirko <jiri@nvidia.com>
		M: Ido Schimmel <idosch@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11109,7 +11109,7 @@ F: drivers/net/ethernet/mellanox/mlxsw/
		F: tools/testing/selftests/drivers/net/mlxsw/

		MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
		M: mlxsw@mellanox.com
		M: mlxsw@nvidia.com
		L: netdev@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11119,7 +11119,7 @@ F: drivers/net/ethernet/mellanox/mlxfw/
		MELLANOX HARDWARE PLATFORM SUPPORT
		M: Andy Shevchenko <andy@infradead.org>
		M: Darren Hart <dvhart@infradead.org>
		M: Vadim Pasternak <vadimp@mellanox.com>
		M: Vadim Pasternak <vadimp@nvidia.com>
		L: platform-driver-x86@vger.kernel.org
		S: Supported
		F: Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
		@@ -11127,7 +11127,7 @@ F: drivers/platform/mellanox/
		F: include/linux/platform_data/mlxreg.h

		MELLANOX MLX4 core VPI driver
		M: Tariq Toukan <tariqt@mellanox.com>
		M: Tariq Toukan <tariqt@nvidia.com>
		L: netdev@vger.kernel.org
		L: linux-rdma@vger.kernel.org
		S: Supported
		@@ -11137,7 +11137,7 @@ F: drivers/net/ethernet/mellanox/mlx4/
		F: include/linux/mlx4/

		MELLANOX MLX4 IB driver
		M: Yishai Hadas <yishaih@mellanox.com>
		M: Yishai Hadas <yishaih@nvidia.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11147,8 +11147,8 @@ F: include/linux/mlx4/
		F: include/uapi/rdma/mlx4-abi.h

		MELLANOX MLX5 core VPI driver
		M: Saeed Mahameed <saeedm@mellanox.com>
		M: Leon Romanovsky <leonro@mellanox.com>
		M: Saeed Mahameed <saeedm@nvidia.com>
		M: Leon Romanovsky <leonro@nvidia.com>
		L: netdev@vger.kernel.org
		L: linux-rdma@vger.kernel.org
		S: Supported
		@@ -11159,7 +11159,7 @@ F: drivers/net/ethernet/mellanox/mlx5/core/
		F: include/linux/mlx5/

		MELLANOX MLX5 IB driver
		M: Leon Romanovsky <leonro@mellanox.com>
		M: Leon Romanovsky <leonro@nvidia.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11169,8 +11169,8 @@ F: include/linux/mlx5/
		F: include/uapi/rdma/mlx5-abi.h

		MELLANOX MLXCPLD I2C AND MUX DRIVER
		M: Vadim Pasternak <vadimp@mellanox.com>
		M: Michael Shych <michaelsh@mellanox.com>
		M: Vadim Pasternak <vadimp@nvidia.com>
		M: Michael Shych <michaelsh@nvidia.com>
		L: linux-i2c@vger.kernel.org
		S: Supported
		F: Documentation/i2c/busses/i2c-mlxcpld.rst
		@@ -11178,7 +11178,7 @@ F: drivers/i2c/busses/i2c-mlxcpld.c
		F: drivers/i2c/muxes/i2c-mux-mlxcpld.c

		MELLANOX MLXCPLD LED DRIVER
		M: Vadim Pasternak <vadimp@mellanox.com>
		M: Vadim Pasternak <vadimp@nvidia.com>
		L: linux-leds@vger.kernel.org
		S: Supported
		F: Documentation/leds/leds-mlxcpld.rst
		@@ -11186,7 +11186,7 @@ F: drivers/leds/leds-mlxcpld.c
		F: drivers/leds/leds-mlxreg.c

		MELLANOX PLATFORM DRIVER
		M: Vadim Pasternak <vadimp@mellanox.com>
		M: Vadim Pasternak <vadimp@nvidia.com>
		L: platform-driver-x86@vger.kernel.org
		S: Supported
		F: drivers/platform/x86/mlx-platform.c
		@@ -12167,8 +12167,8 @@ F: net/ipv6/syncookies.c
		F: net/ipv6/tcp*.c

		NETWORKING [TLS]
		M: Boris Pismenny <borisp@mellanox.com>
		M: Aviad Yehezkel <aviadye@mellanox.com>
		M: Boris Pismenny <borisp@nvidia.com>
		M: Aviad Yehezkel <aviadye@nvidia.com>
		M: John Fastabend <john.fastabend@gmail.com>
		M: Daniel Borkmann <daniel@iogearbox.net>
		M: Jakub Kicinski <kuba@kernel.org>
		@@ -12468,7 +12468,7 @@ S: Supported
		F: drivers/nfc/nxp-nci

		OBJAGG
		M: Jiri Pirko <jiri@mellanox.com>
		M: Jiri Pirko <jiri@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: include/linux/objagg.h
		@@ -13110,7 +13110,7 @@ F: drivers/video/logo/logo_parisc*
		F: include/linux/hp_sdc.h

		PARMAN
		M: Jiri Pirko <jiri@mellanox.com>
		M: Jiri Pirko <jiri@nvidia.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: include/linux/parman.h
		@@ -16034,7 +16034,7 @@ F: drivers/infiniband/sw/siw/
		F: include/uapi/rdma/siw-abi.h

		SOFT-ROCE DRIVER (rxe)
		M: Zhu Yanjun <yanjunz@mellanox.com>
		M: Zhu Yanjun <yanjunz@nvidia.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		F: drivers/infiniband/sw/rxe/

drivers/infiniband/core/device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2751,7 +2751,7 @@ static int __init ib_core_init(void)

		ret = addr_init();
		if (ret) {
		pr_warn("Could't init IB address resolution\n");
		pr_warn("Couldn't init IB address resolution\n");
		goto err_ibnl;
		}

drivers/infiniband/hw/bnxt_re/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -821,7 +821,8 @@ static int bnxt_re_handle_qp_async_event(struct creq_qp_event *qp_event,
		struct ib_event event;
		unsigned int flags;

		if (qp->qplib_qp.state == CMDQ_MODIFY_QP_NEW_STATE_ERR) {
		if (qp->qplib_qp.state == CMDQ_MODIFY_QP_NEW_STATE_ERR &&
		rdma_is_kernel_res(&qp->ib_qp.res)) {
		flags = bnxt_re_lock_cqs(qp);
		bnxt_qplib_add_flush_qp(&qp->qplib_qp);
		bnxt_re_unlock_cqs(qp, flags);

drivers/infiniband/hw/hfi1/tid_rdma.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3215,6 +3215,7 @@ bool hfi1_tid_rdma_wqe_interlock(struct rvt_qp qp, struct rvt_swqe wqe)
		case IB_WR_ATOMIC_CMP_AND_SWP:
		case IB_WR_ATOMIC_FETCH_AND_ADD:
		case IB_WR_RDMA_WRITE:
		case IB_WR_RDMA_WRITE_WITH_IMM:
		switch (prev->wr.opcode) {
		case IB_WR_TID_RDMA_WRITE:
		req = wqe_to_tid_req(prev);