diff options
| author | Jason Gunthorpe <[email protected]> | 2023-10-31 13:54:48 +0000 |
|---|---|---|
| committer | Jason Gunthorpe <[email protected]> | 2023-10-31 13:54:48 +0000 |
| commit | 162e3480246ef69386d4647d2320d86741bf08a2 (patch) | |
| tree | caada42ce40114e7abe5e74acb54781ad4aa424a /scripts/gdb/vmlinux-gdb.py | |
| parent | RDMA/hfi1: Workaround truncation compilation error (diff) | |
| parent | Linux 6.6 (diff) | |
| download | kernel-162e3480246ef69386d4647d2320d86741bf08a2.tar.gz kernel-162e3480246ef69386d4647d2320d86741bf08a2.zip | |
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/[email protected]
Required for the next patch.
Signed-off-by: Jason Gunthorpe <[email protected]>
Diffstat (limited to 'scripts/gdb/vmlinux-gdb.py')
0 files changed, 0 insertions, 0 deletions