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: Tue, 18 May 2010 15:10:37 +1000 [thread overview]
Message-ID: <20100518151037.69226b52.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi Eric,
Today's linux-next merge of the fsnotify tree got a conflict in
fs/notify/inotify/inotify.c between commits
f3ffc7acb6a6ebec0a9e660d9211ed048d7e90f5 ("get rid of S_BIAS") and
73b38e074b51e5d8d2801691dff6e403631e927f ("Saner locking around
deactivate_super()") from the vfs tree and commit
b6bacae18f2f7722df9e8e516ed77b2815bd1ac7 ("inotify: remove inotify in
kernel interface") from the fsnotify tree.
The latter just removed the file, so I did that as well.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-05-18 5:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-18 5:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-03-04 4:46 linux-next: manual merge of the fsnotify tree with the vfs tree 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
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=20100518151037.69226b52.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