From: Trond Myklebust <trond.myklebust@fys.uio.no>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the nfs tree
Date: Wed, 09 Jul 2008 12:44:33 -0400 [thread overview]
Message-ID: <1215621873.7214.15.camel@localhost> (raw)
In-Reply-To: <20080709125611.f25a9467.sfr@canb.auug.org.au>
On Wed, 2008-07-09 at 12:56 +1000, Stephen Rothwell wrote:
> Hi Trond,
>
> Today's linux-next merge of the nfs tree got a conflict in
> net/sunrpc/rpcb_clnt.c between commit
> 0d3a34b48c87a374b37d7a21a60d257d076484f3 ("SUNRPC: Fix a double-free in
> rpcbind") from Linus' tree (which is in nfs tree as well) and some commit
> (s) from the nfs tree.
>
> I just used the version from the nfs tree.
Hi Stephen,
Sorry about that: I cherry-picked those patches from my 'devel' branch.
I should probably have used some other method.
Anyhow, the nfs tree has now been rebased onto today's mainline kernel,
and so the conflict should now be eliminated.
Cheers
Trond
next prev parent reply other threads:[~2008-07-09 16:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-09 2:56 linux-next: manual merge of the nfs tree Stephen Rothwell
2008-07-09 16:44 ` Trond Myklebust [this message]
2008-07-09 17:20 ` 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=1215621873.7214.15.camel@localhost \
--to=trond.myklebust@fys.uio.no \
--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 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.