diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 16:51:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 16:51:39 +0100 |
| commit | d8568d3318d4aa52c2b6b60a8a7e8dcaad836760 (patch) | |
| tree | bd314e5e4ea27c513f6bb0c31fcf646931eb1b9f /net/rds/rdma.c | |
| parent | 6b30fe8a87067987c34f933a35fe8131f19548cb (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-d8568d3318d4aa52c2b6b60a8a7e8dcaad836760.tar.gz linux-next-d8568d3318d4aa52c2b6b60a8a7e8dcaad836760.zip | |
Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
# Conflicts:
# drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
# net/ceph/osd_client.c
Diffstat (limited to 'net/rds/rdma.c')
| -rw-r--r-- | net/rds/rdma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 078090d292fa..81cfbb2b2e87 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -30,7 +30,6 @@ * SOFTWARE. * */ -#include <linux/pagemap.h> #include <linux/slab.h> #include <linux/rbtree.h> #include <linux/dma-mapping.h> /* for DMA_*_DEVICE */ |