From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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 11:25:19 +0200 [thread overview]
Message-ID: <20101025112519.5d932562@endymion.delvare> (raw)
In-Reply-To: <20101025195349.f5ac62eb.sfr@canb.auug.org.au>
On Mon, 25 Oct 2010 19:53:49 +1100, Stephen Rothwell wrote:
> Hi Jean,
>
> On Mon, 25 Oct 2010 10:34:04 +0200 Jean Delvare <khali@linux-fr.org> wrote:
> >
> > This patch depends on a patch adding/updating PCI IDs which I thought
> > was in Jesse Barnes' pci tree which you also pull in linux-next.
> > Apparently my assumption was wrong.
>
> Your series file says that your series is based on 2.6.36-git5, not
> Jesse's pci tree. You can add:
>
> # NEXT-BASE pci
>
> to your series file to force me to import your series on top of Jesse's
> tree instead of 2.6.36-rc5.
I thought it was NEXT_BASE, with an underscore not dash?
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.
> > Jesse, where's this patch?
> > https://patchwork.kernel.org/patch/230361/
> > I certainly hope it's scheduled for merge soon!
> >
> > Meanwhile I've removed the other patch from my i2c-next tree, it will
> > be back only when I'm certain it applied fine.
>
> OK, thanks
--
Jean Delvare
next prev parent reply other threads:[~2010-10-25 9:25 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 [this message]
2010-10-25 10:13 ` Stephen Rothwell
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=20101025112519.5d932562@endymion.delvare \
--to=khali@linux-fr.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox