* linux-next: import of i2c series failed
@ 2009-06-19 0:10 Stephen Rothwell
2009-06-19 7:00 ` Jean Delvare
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-06-19 0:10 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
Hi Jean,
I got this error import the i2c quilt series:
i2c-core-07-limit-locking.patch
error: patch failed: drivers/i2c/i2c-core.c:418
error: drivers/i2c/i2c-core.c: patch does not apply
I noticed that the BASE changed from 3.6.30-git11 yesterday to just
2.6.30 today, so I tried again against 2.6.30-git11 and it all applied.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: import of i2c series failed
2009-06-19 0:10 linux-next: import of i2c series failed Stephen Rothwell
@ 2009-06-19 7:00 ` Jean Delvare
0 siblings, 0 replies; 2+ messages in thread
From: Jean Delvare @ 2009-06-19 7:00 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
Hi Stephen,
On Fri, 19 Jun 2009 10:10:20 +1000, Stephen Rothwell wrote:
> Hi Jean,
>
> I got this error import the i2c quilt series:
>
> i2c-core-07-limit-locking.patch
> error: patch failed: drivers/i2c/i2c-core.c:418
> error: drivers/i2c/i2c-core.c: patch does not apply
>
> I noticed that the BASE changed from 3.6.30-git11 yesterday to just
> 2.6.30 today, so I tried again against 2.6.30-git11 and it all applied.
User error, sorry about that. I erroneously updated the series file
while the latest git patch was temporarily not applied to my local
tree. It's all fixed now, sorry for the trouble.
--
Jean Delvare
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-19 7:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-19 0:10 linux-next: import of i2c series failed Stephen Rothwell
2009-06-19 7:00 ` Jean Delvare
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox