The patch titled
smb.h: do not include linux/time.h in userspace
has been added to the -mm tree. Its filename is
smbh-do-not-include-linux-timeh-in-userspace.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 ***
See http://userweb.kernel.org/~akpm/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: smb.h: do not include linux/time.h in userspace
From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
linux/time.h conflicts with time.h from glibc
It breaks building smbmount from samba. It's regression introduced by
commit 76308da (" smb.h: uses struct timespec but didn't include
linux/time.h").
Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx> [2.6.26.x]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/smb.h | 2 ++
1 file changed, 2 insertions(+)
diff -puN include/linux/smb.h~smbh-do-not-include-linux-timeh-in-userspace include/linux/smb.h
--- a/include/linux/smb.h~smbh-do-not-include-linux-timeh-in-userspace
+++ a/include/linux/smb.h
@@ -11,7 +11,9 @@
#include <linux/types.h>
#include <linux/magic.h>
+#ifdef __KERNEL__
#include <linux/time.h>
+#endif
enum smb_protocol {
SMB_PROTOCOL_NONE,
_
Patches currently in -mm which might be from kirill@xxxxxxxxxxxxx are
smbh-do-not-include-linux-timeh-in-userspace.patch
alpha-introduce-field-taso-into-struct-linux_binprm.patch
allow-recursion-in-binfmt_script-and-binfmt_misc.patch
allow-recursion-in-binfmt_script-and-binfmt_misc-fix.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
