git.maquefel.me Git - linux.git/commit

author	Jason Gunthorpe <jgg@nvidia.com>
	Tue, 31 Oct 2023 13:54:48 +0000 (10:54 -0300)
committer	Jason Gunthorpe <jgg@nvidia.com>
	Tue, 31 Oct 2023 13:54:48 +0000 (10:54 -0300)
commit	162e3480246ef69386d4647d2320d86741bf08a2
tree	caada42ce40114e7abe5e74acb54781ad4aa424a	tree \| snapshot
parent	d4b2d165714c0ce8777d5131f6e0aad617b7adc4	commit \| diff
parent	ffc253263a1375a65fa6c9f62a893e9767fbebfa	commit \| diff

Merge tag 'v6.6' into rdma.git for-next

Resolve conflict by taking the spin_lock hunk from for-next:

https://lore.kernel.org/r/20230928113851.5197a1ec@canb.auug.org.au

Required for the next patch.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/infiniband/core/nldev.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/siw/siw_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history