diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
| commit | 6fbefa4e81780e7e372c19e31cd33cc2456b230f (patch) | |
| tree | 79178a0b363a4673ff0c859b25d0d20d890fc234 /security | |
| parent | 9c513523039dc8ee83f8f527acdcbc7a792d83bc (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.tar.gz linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.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 'security')
| -rw-r--r-- | security/commoncap.c | 3 | ||||
| -rw-r--r-- | security/inode.c | 1 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 1 | ||||
| -rw-r--r-- | security/selinux/selinuxfs.c | 1 | ||||
| -rw-r--r-- | security/smack/smack_lsm.c | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 37985eb30333..565c893c6d4b 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -10,13 +10,10 @@ #include <linux/file.h> #include <linux/mm.h> #include <linux/mman.h> -#include <linux/pagemap.h> -#include <linux/swap.h> #include <linux/skbuff.h> #include <linux/netlink.h> #include <linux/ptrace.h> #include <linux/xattr.h> -#include <linux/hugetlb.h> #include <linux/mount.h> #include <linux/sched.h> #include <linux/prctl.h> diff --git a/security/inode.c b/security/inode.c index 080402367674..346172b8f814 100644 --- a/security/inode.c +++ b/security/inode.c @@ -15,7 +15,6 @@ #include <linux/fs.h> #include <linux/fs_context.h> #include <linux/mount.h> -#include <linux/pagemap.h> #include <linux/init.h> #include <linux/namei.h> #include <linux/security.h> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 92b5ecebe0d4..51454c411a03 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -35,7 +35,6 @@ #include <linux/mm.h> #include <linux/mman.h> #include <linux/slab.h> -#include <linux/pagemap.h> #include <linux/proc_fs.h> #include <linux/swap.h> #include <linux/spinlock.h> diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 310e19efff1d..7efe097de208 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -13,7 +13,6 @@ */ #include <linux/kernel.h> -#include <linux/pagemap.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/fs.h> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 28a8e12603ce..3524649f402d 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -16,7 +16,6 @@ */ #include <linux/xattr.h> -#include <linux/pagemap.h> #include <linux/mount.h> #include <linux/stat.h> #include <linux/kd.h> |