diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 13:21:03 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 13:21:03 -0400 |
| commit | c0fe82baaeb2719f910359684c0817057f79a84a (patch) | |
| tree | 74d879664c964efbf64ee51b5aa5a582fa868635 /tools/testing/selftests/bpf/prog_tests/autoload.c | |
| parent | RDMA/irdma: Remove the redundant return (diff) | |
| parent | Linux 5.16 (diff) | |
| download | wireguard-linux-c0fe82baaeb2719f910359684c0817057f79a84a.tar.xz wireguard-linux-c0fe82baaeb2719f910359684c0817057f79a84a.zip | |
Merge tag 'v5.16' into rdma.git for-next
To resolve minor conflict in:
drivers/infiniband/hw/mlx5/mlx5_ib.h
By merging both hunks.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/autoload.c')
0 files changed, 0 insertions, 0 deletions