diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-21 14:17:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-21 14:17:20 +0100 |
| commit | ab09a7a6cba036f328d26582f2f180fec00dc407 (patch) | |
| tree | adaf7d5ed0541b24c0b542a5c56601b4ec813562 /include/linux/ceph | |
| parent | d79507afada06e7f8a89e1f89722df4cd0392524 (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-ab09a7a6cba036f328d26582f2f180fec00dc407.tar.gz linux-next-ab09a7a6cba036f328d26582f2f180fec00dc407.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 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/libceph.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 691e1bdece49..f92fdd853f1f 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h @@ -11,7 +11,6 @@ #include <linux/bug.h> #include <linux/fs.h> #include <linux/mempool.h> -#include <linux/pagemap.h> #include <linux/wait.h> #include <linux/writeback.h> #include <linux/slab.h> |