mirror of
https://github.com/torvalds/linux.git
synced 2025-11-08 20:49:35 +02:00
a6f844da39
-----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmKKlIAeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGC3oH/iPm/fLG2sJut8My sU0RC9K+6ESV5h2Qy6k00/lqKstlu4EvBjw4V8vYpx3Q2+hbSFMn2SeWqqqT3Lkk Zb8KINCFuuyMtdCBb42PV0zhUf5pCQF7ocm/Ae4jllDHtPmqk3WJ6IGtZBK5JBlw z6RR/wKt0y0MRj9eZyPyYjOee2L2vuVh4tgnexK/4L8g2ZtMMRThhvUzSMWG4zxR STYYNp0uFcfT1Vt85+ODevFH4TvdECAj+SqAegN+seHLM17YY7M0/WiIYpxGRv8P lIpDQl4PBU8EBkpI5hkpJ/3qPincbuVOMLsYfxFtpcjjG12vGjFp2krGpS3TedZQ 3mvaJ7c= =vLke -----END PGP SIGNATURE----- Merge tag 'v5.18' into rdma.git for-next Following patches have dependencies. Resolve the merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names for the fs functions following linux-next: https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
||
|---|---|---|
| .. | ||
| ah.c | ||
| ah.h | ||
| cq.c | ||
| cq.h | ||
| Kconfig | ||
| mad.c | ||
| mad.h | ||
| Makefile | ||
| mcast.c | ||
| mcast.h | ||
| mmap.c | ||
| mmap.h | ||
| mr.c | ||
| mr.h | ||
| pd.c | ||
| pd.h | ||
| qp.c | ||
| qp.h | ||
| rc.c | ||
| srq.c | ||
| srq.h | ||
| trace.c | ||
| trace.h | ||
| trace_cq.h | ||
| trace_mr.h | ||
| trace_qp.h | ||
| trace_rc.h | ||
| trace_rvt.h | ||
| trace_tx.h | ||
| vt.c | ||
| vt.h | ||