From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sage Weil <sage@newdream•net>
Cc: Trond Myklebust <trond.myklebust@fys•uio.no>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Peter Zijlstra <peterz@infradead•org>,
Wu Fengguang <fengguang.wu@intel•com>
Subject: Re: linux-next: nfs/ceph tree build failure
Date: Fri, 8 Jan 2010 16:16:36 +1100 [thread overview]
Message-ID: <20100108161636.f68b72b6.sfr@canb.auug.org.au> (raw)
In-Reply-To: <Pine.LNX.4.64.1001072048420.7474@cobra.newdream.net>
[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]
Hi Sage,
On Thu, 7 Jan 2010 20:51:45 -0800 (PST) Sage Weil <sage@newdream•net> wrote:
>
> Okay. I can move it to my tree as well, where I assume it'll need to be
> when it comes time to merge.
Well, that depends on the order that the two trees get merged into Linus'
tree. If you get in first, then Trond will have to fix up his tree
before merging (or get Linus to apply my patch as a merge fixup).
One possible thing you could do is to apply both the nfs tree patch and
my patch to your tree (or merge the nfs tree into your tree and apply the
merge fixup), but that will cause a problem if the patch is updated in
the nfs tree (or the nfs tree rebases) ...
So the easiest thing (at leas at this early stage of the development
cycle) is for me to keep applying the merge fixup to my tree when I merge
the later of your two trees into linux-next (this is an automated
process). Maybe in a few weeks we might do something different.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
prev parent reply other threads:[~2010-01-08 5:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 0:11 linux-next: nfs/ceph tree build failure Stephen Rothwell
2010-01-08 0:18 ` Trond Myklebust
2010-01-08 1:19 ` Stephen Rothwell
2010-01-08 4:51 ` Sage Weil
2010-01-08 5:16 ` 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=20100108161636.f68b72b6.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=fengguang.wu@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=sage@newdream$(echo .)net \
--cc=trond.myklebust@fys$(echo .)uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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