From: Eric Paris <eparis@redhat.com>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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, 09 Feb 2010 08:02:54 -0500 [thread overview]
Message-ID: <1265720575.18730.24.camel@localhost> (raw)
In-Reply-To: <20100209054521.GK30031@ZenIV.linux.org.uk>
On Tue, 2010-02-09 at 05:45 +0000, Al Viro wrote:
> 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.
I know I merged it yesterday, but now I can't for the life of me find
the branch I merged it onto, obviously it wasn't my for-next branch.
I'm so confused. Anyway, yes, I'll merge it again right now.....
-Eric
next prev parent reply other threads:[~2010-02-09 13:03 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
2010-02-09 6:08 ` Stephen Rothwell
2010-02-09 13:02 ` Eric Paris [this message]
-- 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=1265720575.18730.24.camel@localhost \
--to=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).