From: Steven Whitehouse <swhiteho@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Subject: Re: linux-next: manual merge of the vfs tree with the gfs2 tree
Date: Mon, 18 Jan 2010 10:56:41 +0000 [thread overview]
Message-ID: <1263812201.2715.11.camel@localhost> (raw)
In-Reply-To: <20100118105556.230beb08.sfr@canb.auug.org.au>
Hi,
On Mon, 2010-01-18 at 10:55 +1100, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/gfs2/ops_inode.c between commit
> 83c77e8b3457f2ee5dad028dc54cf3ce540104b2 ("GFS2: Fix refcnt leak on
> gfs2_follow_link() error path") from the gfs2 tree and commit
> 261a144ac2b3867c7be70f08925e446430df6937 ("Switch gfs2 to nd_set_link()")
> from the vfs tree.
>
> I can't figure out if the gfs2 tree fix is required any more, so I just
> used the vfs tree version.
>
> Al, if that gfs2 patch is standalone, you should probably send it to the
> gfs2 guys.
>
It looks as if the two patches would be alternatives. The only question
is whether Al's patch should be left for the merge window or whether its
ok to send it ahead of time to fix the issue (which is what I had been
intending to do with the bug fix prior to Al's patch).
Thoughts?
Steve.
next prev parent reply other threads:[~2010-01-18 10:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 23:55 linux-next: manual merge of the vfs tree with the gfs2 tree Stephen Rothwell
2010-01-18 10:56 ` Steven Whitehouse [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-05-27 1:52 Stephen Rothwell
2009-05-27 9:58 ` Steven Whitehouse
2009-06-12 1:12 ` Stephen Rothwell
2009-06-12 1:19 ` Al Viro
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=1263812201.2715.11.camel@localhost \
--to=swhiteho@redhat.com \
--cc=hirofumi@mail.parknet.co.jp \
--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).