From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Eric Paris <eparis@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Al Viro <viro@zeniv•linux.org.uk>
Subject: linux-next: manual merge of the fsnotify tree with the vfs tree
Date: Mon, 18 Jan 2010 17:29:44 +1100 [thread overview]
Message-ID: <20100118172944.c80b15d5.sfr@canb.auug.org.au> (raw)
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@canb•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 */
next reply other threads:[~2010-01-18 6:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-18 6:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-18 5:10 linux-next: manual merge of the fsnotify tree with the vfs tree Stephen Rothwell
2010-03-04 4:46 Stephen Rothwell
2010-02-15 6:56 Stephen Rothwell
2010-02-09 5:37 Stephen Rothwell
2010-02-09 5:37 Stephen Rothwell
2010-02-09 5:37 Stephen Rothwell
2010-02-09 5:37 Stephen Rothwell
2010-02-09 5:45 ` Al Viro
2010-02-09 6:08 ` Stephen Rothwell
2010-02-09 13:02 ` Eric Paris
2010-02-02 4:26 Stephen Rothwell
2010-01-18 6:29 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100118172944.c80b15d5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=eparis@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox