diff options
| author | Jason Gunthorpe <[email protected]> | 2025-05-26 18:32:29 +0000 |
|---|---|---|
| committer | Jason Gunthorpe <[email protected]> | 2025-05-26 18:33:52 +0000 |
| commit | ef2233850edc4cc0d5fc6136fcdb004a1ddfa7db (patch) | |
| tree | 8ccfb0731d7ddf7d384c37b56ee15a22db025c0a /rust/helpers/helpers.c | |
| parent | RDMA/bnxt_re: Support extended stats for Thor2 VF (diff) | |
| parent | Linux 6.15 (diff) | |
| download | kernel-ef2233850edc4cc0d5fc6136fcdb004a1ddfa7db.tar.gz kernel-ef2233850edc4cc0d5fc6136fcdb004a1ddfa7db.zip | |
Merge tag 'v6.15' into rdma.git for-next
Following patches need the RDMA rc branch since we are past the RC cycle
now.
Merge conflicts resolved based on Linux-next:
- For RXE odp changes keep for-next version and fixup new places that
need to call is_odp_mr()
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
- irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info
change from for-next
https://lore.kernel.org/r/[email protected]
Signed-off-by: Jason Gunthorpe <[email protected]>
Diffstat (limited to 'rust/helpers/helpers.c')
| -rw-r--r-- | rust/helpers/helpers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index e1c21eba9b15..1e7c84df7252 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -14,6 +14,7 @@ #include "cpumask.c" #include "cred.c" #include "device.c" +#include "dma.c" #include "err.c" #include "fs.c" #include "io.c" |