diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-10 01:31:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-10 01:31:24 +0100 |
| commit | ad0f62e9afacca3517bd8a69c8a06389ec9bd925 (patch) | |
| tree | ed47fbbd716bd4a812372f145f0f80f3110f34b4 /include/linux | |
| parent | dba9716e82ae2c9eacfdc0925360375cd0bb6830 (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-ad0f62e9afacca3517bd8a69c8a06389ec9bd925.tar.gz linux-next-ad0f62e9afacca3517bd8a69c8a06389ec9bd925.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')
| -rw-r--r-- | include/linux/balloon.h | 1 | ||||
| -rw-r--r-- | include/linux/ceph/libceph.h | 1 | ||||
| -rw-r--r-- | include/linux/i3c/master.h | 1 | ||||
| -rw-r--r-- | include/linux/ksm.h | 1 | ||||
| -rw-r--r-- | include/linux/mempolicy.h | 1 | ||||
| -rw-r--r-- | include/linux/nfs_fs.h | 1 | ||||
| -rw-r--r-- | include/linux/nfs_page.h | 1 | ||||
| -rw-r--r-- | include/linux/suspend.h | 1 | ||||
| -rw-r--r-- | include/linux/swap.h | 1 |
9 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/balloon.h b/include/linux/balloon.h index ca5b15150f42..13a0af318cc2 100644 --- a/include/linux/balloon.h +++ b/include/linux/balloon.h @@ -36,7 +36,6 @@ */ #ifndef _LINUX_BALLOON_H #define _LINUX_BALLOON_H -#include <linux/pagemap.h> #include <linux/page-flags.h> #include <linux/migrate.h> #include <linux/gfp.h> 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> diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index d58070a72a49..34d1f3a98343 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -11,6 +11,7 @@ #include <asm/bitsperlong.h> #include <linux/bitops.h> +#include <linux/dma-direction.h> #include <linux/i2c.h> #include <linux/i3c/ccc.h> #include <linux/i3c/device.h> diff --git a/include/linux/ksm.h b/include/linux/ksm.h index d39d0d5483a2..edfa67017560 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -10,7 +10,6 @@ #include <linux/bitops.h> #include <linux/mm.h> -#include <linux/pagemap.h> #include <linux/rmap.h> #include <linux/sched.h> diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 65c732d440d2..ba262af53863 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -13,7 +13,6 @@ #include <linux/spinlock.h> #include <linux/node.h> #include <linux/nodemask.h> -#include <linux/pagemap.h> #include <uapi/linux/mempolicy.h> struct mm_struct; diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index d2c716322c6f..9f3c0017944a 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -21,7 +21,6 @@ #include <linux/in.h> #include <linux/mm.h> -#include <linux/pagemap.h> #include <linux/rbtree.h> #include <linux/refcount.h> #include <linux/rwsem.h> diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index c38e4b380be5..bddcc632172c 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -12,7 +12,6 @@ #include <linux/list.h> -#include <linux/pagemap.h> #include <linux/wait.h> #include <linux/sunrpc/auth.h> #include <linux/nfs_xdr.h> diff --git a/include/linux/suspend.h b/include/linux/suspend.h index a3815027773c..44690e4452d2 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -2,7 +2,6 @@ #ifndef _LINUX_SUSPEND_H #define _LINUX_SUSPEND_H -#include <linux/swap.h> #include <linux/notifier.h> #include <linux/init.h> #include <linux/pm.h> diff --git a/include/linux/swap.h b/include/linux/swap.h index 4f686709d71f..80d74c191d7d 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -10,7 +10,6 @@ #include <linux/sched.h> #include <linux/node.h> #include <linux/fs.h> -#include <linux/pagemap.h> #include <linux/atomic.h> #include <linux/page-flags.h> #include <uapi/linux/mempolicy.h> |