The patch titled rename struct namespace to struct mnt_namespace has been added to the -mm tree. Its filename is rename-struct-namespace-to-struct-mnt_namespace-cachefiles.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: rename struct namespace to struct mnt_namespace From: Kirill Korotaev <dev@xxxxx> Rename 'struct namespace' to 'struct mnt_namespace' to avoid confusion with other namespaces being developped for the containers : pid, uts, ipc, etc. 'namespace' variables and attributes are also renamed to 'mnt_ns' Signed-off-by: Kirill Korotaev <dev@xxxxx> Signed-off-by: Cedric Le Goater <clg@xxxxxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Cc: Herbert Poetzl <herbert@xxxxxxxxxxxx> Cc: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/cachefiles/cf-bind.c | 2 +- fs/cachefiles/cf-proc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN fs/cachefiles/cf-bind.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles fs/cachefiles/cf-bind.c --- a/fs/cachefiles/cf-bind.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles +++ a/fs/cachefiles/cf-bind.c @@ -18,7 +18,7 @@ #include <linux/file.h> #include <linux/namei.h> #include <linux/mount.h> -#include <linux/namespace.h> +#include <linux/mnt_namespace.h> #include <linux/statfs.h> #include <linux/proc_fs.h> #include <linux/ctype.h> diff -puN fs/cachefiles/cf-proc.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles fs/cachefiles/cf-proc.c --- a/fs/cachefiles/cf-proc.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles +++ a/fs/cachefiles/cf-proc.c @@ -18,7 +18,7 @@ #include <linux/file.h> #include <linux/namei.h> #include <linux/mount.h> -#include <linux/namespace.h> +#include <linux/mnt_namespace.h> #include <linux/statfs.h> #include <linux/proc_fs.h> #include <linux/ctype.h> @@ -70,7 +70,6 @@ static const struct cachefiles_proc_cmd { "", NULL } }; - /*****************************************************************************/ /* * do various checks _ Patches currently in -mm which might be from dev@xxxxx are rename-struct-namespace-to-struct-mnt_namespace.patch rename-struct-namespace-to-struct-mnt_namespace-cachefiles.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html