diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2021-10-04 20:59:49 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-10-04 21:01:26 +0200 |
| commit | c78d218fc5a9995d6b50aa38814bef4fbc88a77d (patch) | |
| tree | 8c647466fa60cb281556016388adf0ad80172c8c /arch/x86/include/asm/alternative.h | |
| parent | RDMA/rxe: Bump up default maximum values used via uverbs (diff) | |
| parent | Linux 5.15-rc4 (diff) | |
| download | linux-c78d218fc5a9995d6b50aa38814bef4fbc88a77d.tar.xz linux-c78d218fc5a9995d6b50aa38814bef4fbc88a77d.zip | |
Merge tag 'v5.15-rc4' into rdma.get for-next
Merged due to dependencies in following patches.
Conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c resolved by hand to take
the %p change and txq stats rename together.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'arch/x86/include/asm/alternative.h')
0 files changed, 0 insertions, 0 deletions