From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jean Delvare <khali@linux-fr.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: linux-next: error importing i2c quilt series
Date: Mon, 25 Oct 2010 21:13:27 +1100 [thread overview]
Message-ID: <20101025211327.9d40f4a1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20101025112519.5d932562@endymion.delvare>
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
Hi Jean,
On Mon, 25 Oct 2010 11:25:19 +0200 Jean Delvare <khali@linux-fr.org> wrote:
>
> I thought it was NEXT_BASE, with an underscore not dash?
Ah, yes, sorry ... (but my scripts actually handle either)
> And I also expected the trees to be merged in the order shows in:
> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob;f=Next/Trees;hb=HEAD
>
> As pci is listed before i2c, I (wrongly) concluded that everything
> would be fine even without using NEXT_BASE. I stand corrected.
What actually happens is
I fetch all the trees and quilt series
I import the quilt series to git branches
I merge the trees.
So you cannot depend on the merge order (which sometimes changes as
well). This makes sense since I have no influence over the order that
the trees get merged by Linus ... If there are dependencies, they need to
be explicit, sorry, using NEXT_BASE in quilt series or merging (sub)
trees for git.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-10-25 10:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-24 23:59 linux-next: error importing i2c quilt series Stephen Rothwell
2010-10-25 8:34 ` Jean Delvare
2010-10-25 8:53 ` Stephen Rothwell
2010-10-25 9:25 ` Jean Delvare
2010-10-25 10:13 ` Stephen Rothwell [this message]
2010-10-26 9:07 ` Jean Delvare
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=20101025211327.9d40f4a1.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jbarnes@virtuousgeek.org \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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