diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2023-10-31 10:54:48 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-10-31 10:54:48 -0300 |
| commit | 162e3480246ef69386d4647d2320d86741bf08a2 (patch) | |
| tree | caada42ce40114e7abe5e74acb54781ad4aa424a /net/openvswitch/ssh:/git@git.zx2c4.com/git: | |
| parent | RDMA/hfi1: Workaround truncation compilation error (diff) | |
| parent | Linux 6.6 (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>
Diffstat (limited to 'net/openvswitch/ssh:/git@git.zx2c4.com/git:')
0 files changed, 0 insertions, 0 deletions