From: "J. Bruce Fields" <bfields@fieldses.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
linux-next@vger.kernel.org, Julia Lawall <julia@diku.dk>
Subject: Re: linux-next: manual merge of the vfs tree
Date: Tue, 12 Aug 2008 15:27:52 -0400 [thread overview]
Message-ID: <20080812192752.GG30729@fieldses.org> (raw)
In-Reply-To: <20080812152037.b7de321f.sfr@canb.auug.org.au>
On Tue, Aug 12, 2008 at 03:20:37PM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/nfsd/export.c between commit 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca
> ("fs/nfsd/export.c: Adjust error handling code involving
> auth_domain_put") from the nfsd tree and commit
> eec56f5904cd79d7cf99efd74ad02f39c829fff1 ("switch nfsd to kern_path()")
> from the vfs tree.
>
> The conflict is contextual. I fixed it up and can carry the fixup.
OK, thanks. Looks like I can't help for now as long as kern_path()
isn't upstream.
(Minor request, if it's easy to automate: would it be possible to
include a url for linux-next (or even for the specific tree that the
commit came from) with these messages? It'd just save a little googling
when I want to see what's going on.)
--b.
next prev parent reply other threads:[~2008-08-12 19:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 5:20 linux-next: manual merge of the vfs tree Stephen Rothwell
2008-08-12 19:27 ` J. Bruce Fields [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the vfs tree Thierry Reding
2008-10-15 6:50 Stephen Rothwell
2008-08-19 5:25 Stephen Rothwell
2008-08-19 5:23 Stephen Rothwell
2008-08-12 5:14 Stephen Rothwell
2008-08-12 5:01 Stephen Rothwell
2008-07-25 4:30 Stephen Rothwell
2008-07-18 5:36 Stephen Rothwell
2008-07-18 8:33 ` Ralf Baechle
2008-07-18 9:06 ` Stephen Rothwell
2008-07-18 12:51 ` Al Viro
2008-07-18 5:33 Stephen Rothwell
2008-07-18 5:27 Stephen Rothwell
2008-07-18 9:44 ` Stephen Rothwell
2008-06-25 5:47 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=20080812192752.GG30729@fieldses.org \
--to=bfields@fieldses.org \
--cc=julia@diku.dk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.