From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: linux-next@vger.kernel.org
Subject: linux-next: manual merge of the nfs tree
Date: Wed, 9 Jul 2008 12:56:11 +1000 [thread overview]
Message-ID: <20080709125611.f25a9467.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-09 2:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-09 2:56 Stephen Rothwell [this message]
2008-07-09 16:44 ` linux-next: manual merge of the nfs tree Trond Myklebust
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=20080709125611.f25a9467.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-next@vger.kernel.org \
--cc=trond.myklebust@fys.uio.no \
/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