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 10:34:04 +0200 [thread overview]
Message-ID: <20101025103404.73c24f45@endymion.delvare> (raw)
In-Reply-To: <20101025105900.83472a69.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, 25 Oct 2010 10:59:00 +1100, Stephen Rothwell wrote:
> Hi Jean,
>
> Trying to import today's i2c quilt series gave me these errors:
>
> i2c-i801-add-intel-patsburg-device-id.patch
> error: patch failed: include/linux/pci_ids.h:2444
> error: include/linux/pci_ids.h: patch does not apply
> Context reduced to (1/1) to apply fragment at 101
> Context reduced to (1/1) to apply fragment at 45
> error: patch failed: drivers/i2c/busses/i2c-i801.c:592
> error: drivers/i2c/busses/i2c-i801.c: patch does not apply
>
> I will use the i2c tree from next-20101022 for today.
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.
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.
Thanks,
--
Jean Delvare
next prev parent reply other threads:[~2010-10-25 8:34 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 [this message]
2010-10-25 8:53 ` Stephen Rothwell
2010-10-25 9:25 ` Jean Delvare
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=20101025103404.73c24f45@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