The patch titled Subject: autofs4: fix string.h include in auto_dev-ioctl.h has been added to the -mm tree. Its filename is autofs4-fix-stringh-include-in-auto_dev-ioctlh.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/autofs4-fix-stringh-include-in-auto_dev-ioctlh.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/autofs4-fix-stringh-include-in-auto_dev-ioctlh.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Ian Kent <raven@xxxxxxxxxx> Subject: autofs4: fix string.h include in auto_dev-ioctl.h Since including linux/string.h will now do the right thing remove the conditional check. Signed-off-by: Ian Kent <raven@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/auto_dev-ioctl.h | 5 ----- 1 file changed, 5 deletions(-) diff -puN include/linux/auto_dev-ioctl.h~autofs4-fix-stringh-include-in-auto_dev-ioctlh include/linux/auto_dev-ioctl.h --- a/include/linux/auto_dev-ioctl.h~autofs4-fix-stringh-include-in-auto_dev-ioctlh +++ a/include/linux/auto_dev-ioctl.h @@ -11,12 +11,7 @@ #define _LINUX_AUTO_DEV_IOCTL_H #include <linux/auto_fs.h> - -#ifdef __KERNEL__ #include <linux/string.h> -#else -#include <string.h> -#endif /* __KERNEL__ */ #define AUTOFS_DEVICE_NAME "autofs" _ Patches currently in -mm which might be from raven@xxxxxxxxxx are autofs4-coding-style-fixes.patch autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch autofs4-fix-coding-style-line-length-in-autofs4_wait.patch autofs4-fix-invalid-ioctl-return-in-autofs4_root_ioctl_unlocked.patch autofs4-fix-some-white-space-errors.patch autofs4-fix-stringh-include-in-auto_dev-ioctlh.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