From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the nfs tree
Date: Thu, 10 Jul 2008 03:20:33 +1000 [thread overview]
Message-ID: <20080710032033.a239e265.sfr@canb.auug.org.au> (raw)
In-Reply-To: <1215621873.7214.15.camel@localhost>
[-- Attachment #1: Type: text/plain, Size: 673 bytes --]
Hi Trond,
On Wed, 09 Jul 2008 12:44:33 -0400 Trond Myklebust <trond.myklebust@fys.uio.no> wrote:
>
> Sorry about that: I cherry-picked those patches from my 'devel' branch.
> I should probably have used some other method.
Its not really a problem. Since the patch is the same in both trees and
only one tree further modifies the code, I just take that. This will
happen occasionally as fixes go into Linus' tree.
> Anyhow, the nfs tree has now been rebased onto today's mainline kernel,
> and so the conflict should now be eliminated.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
prev parent reply other threads:[~2008-07-09 17:20 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
2008-07-09 17:20 ` Stephen Rothwell [this message]
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=20080710032033.a239e265.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