The patch titled fuse: use MISC_MAJOR has been added to the -mm tree. Its filename is fuse-use-misc_major.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fuse: use MISC_MAJOR From: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx> The following patches add POSIX file locking to the fuse interface. Additional changes ralated to this are: - asynchronous interrupt of requests by SIGKILL no longer supported - separate control filesystem, instead of using sysfs objects - add support for synchronously interrupting requests Details are documented in Documentation/filesystems/fuse.txt throughout the patches. This patch: Have fuse.h use MISC_MAJOR rather than a hardcoded '10'. Signed-off-by: Jan Engelhardt <jengelh@xxxxxx> Signed-off-by: Miklos Szeredi <miklos@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/fuse.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN include/linux/fuse.h~fuse-use-misc_major include/linux/fuse.h --- a/include/linux/fuse.h~fuse-use-misc_major +++ a/include/linux/fuse.h @@ -9,6 +9,7 @@ /* This file defines the kernel interface of FUSE */ #include <asm/types.h> +#include <linux/major.h> /** Version number of this interface */ #define FUSE_KERNEL_VERSION 7 @@ -20,7 +21,7 @@ #define FUSE_ROOT_ID 1 /** The major number of the fuse character device */ -#define FUSE_MAJOR 10 +#define FUSE_MAJOR MISC_MAJOR /** The minor number of the fuse character device */ #define FUSE_MINOR 229 _ Patches currently in -mm which might be from jengelh@xxxxxxxxxxxxxxx are lsm-add-task_setioprio-hook.patch update-devicestxt.patch printk-time-parameter.patch fuse-use-misc_major.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