| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 18 Jan 2010 17:29:44 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Eric Paris <eparis@...hat.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the fsnotify tree with the vfs tree
Hi Eric,
Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fs.h between commit
6d125529c6cbfe570ce3bf9a0728548f087499da ("Fix ACC_MODE() for real") from
the vfs tree and commit 8b006ddbcdc223f1053ab98dfa5460cd4ecd27b9 ("vfs:
introduce FMODE_NONOTIFY") from the fsnotify tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc include/linux/fs.h
index 416b8bd,d6190a8..0000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2461,8 -2460,9 +2459,9 @@@ int proc_nr_files(struct ctl_table *tab
int __init get_filesystem_list(char *buf);
-#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
+#define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE])
- #define OPEN_FMODE(flag) ((__force fmode_t)((flag + 1) & O_ACCMODE))
+ #define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \
+ (flag & FMODE_NONOTIFY)))
#endif /* __KERNEL__ */
#endif /* _LINUX_FS_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists