From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the fsnotify tree with the vfs tree
Date: Tue, 9 Feb 2010 05:45:22 +0000 [thread overview]
Message-ID: <20100209054521.GK30031@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20100209163708.b7ae6d05.sfr@canb.auug.org.au>
On Tue, Feb 09, 2010 at 04:37:08PM +1100, Stephen Rothwell wrote:
> Hi Eric,
>
> Today's linux-next merge of the fsnotify tree got a conflict in
> fs/namei.c between commit 123df2944c436c80640c4281c5bc9c7950b18687 ("Lose
> the new_name argument of fsnotify_move()") from the vfs tree and commit
> 2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char *
> for dentry->d_name.name") from the fsnotify tree.
>
> The former removed the code changed by the latter, so I used the former.
FWIW, I've put two commits (audit_inode_child and fsnotify_move ones) into
a new not-for-rebase branch (for-fsnotify) and told Eric, so hopefully
he'll just pull it into fsnotify tree.
next prev parent reply other threads:[~2010-02-09 5:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 5:37 linux-next: manual merge of the fsnotify tree with the vfs tree Stephen Rothwell
2010-02-09 5:45 ` Al Viro [this message]
2010-02-09 6:08 ` Stephen Rothwell
2010-02-09 13:02 ` Eric Paris
-- strict thread matches above, loose matches on Subject: below --
2010-05-18 5:10 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-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=20100209054521.GK30031@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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