mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-11-09 14:40:35 +00:00
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmHbZ+YeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGDs4H/RgC8JOV3Dki1VtO
6OwPxUKKojhVU9LJis7kyG5voB/zE7tK5nI+jC3gYGQUFKWaZ3YY8s3UcV1zvg/b
a44b91boA+dKxEwOq4RZNQ9mU+QWnNoG5+UqBkmB8vewi3QC3T8xEmpWcERLbU7d
KrI2T6i4ksJ9OYSYMEMyrvrpt7nt3n1tDX8b71faXjf1zbLeGo9zT53t6BJ/LknV
AK406Eq/3bg36OZrKFuG7hCJfRE/cSlxF9bxK3sIfMBMQ2YPe1S5+pxl5iBD0nyl
NaHOBYcLTxPAne3YgIvK0zDdsS+EtPSlaVdWfSmNjQhX2vqEixldgdrOCmwp37vd
3gV9D28=
=hrOo
-----END PGP SIGNATURE-----
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>
|
||
|---|---|---|
| .. | ||
| hns_roce_ah.c | ||
| hns_roce_alloc.c | ||
| hns_roce_cmd.c | ||
| hns_roce_cmd.h | ||
| hns_roce_common.h | ||
| hns_roce_cq.c | ||
| hns_roce_db.c | ||
| hns_roce_device.h | ||
| hns_roce_hem.c | ||
| hns_roce_hem.h | ||
| hns_roce_hw_v2_dfx.c | ||
| hns_roce_hw_v2.c | ||
| hns_roce_hw_v2.h | ||
| hns_roce_main.c | ||
| hns_roce_mr.c | ||
| hns_roce_pd.c | ||
| hns_roce_qp.c | ||
| hns_roce_restrack.c | ||
| hns_roce_srq.c | ||
| Kconfig | ||
| Makefile | ||