* linux-next: error importing i2c quilt series @ 2010-10-24 23:59 Stephen Rothwell 2010-10-25 8:34 ` Jean Delvare 0 siblings, 1 reply; 6+ messages in thread From: Stephen Rothwell @ 2010-10-24 23:59 UTC (permalink / raw) To: Jean Delvare; +Cc: linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 612 bytes --] 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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: error importing i2c quilt series 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 0 siblings, 1 reply; 6+ messages in thread From: Jean Delvare @ 2010-10-25 8:34 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jesse Barnes 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: error importing i2c quilt series 2010-10-25 8:34 ` Jean Delvare @ 2010-10-25 8:53 ` Stephen Rothwell 2010-10-25 9:25 ` Jean Delvare 0 siblings, 1 reply; 6+ messages in thread From: Stephen Rothwell @ 2010-10-25 8:53 UTC (permalink / raw) To: Jean Delvare; +Cc: linux-next, linux-kernel, Jesse Barnes [-- Attachment #1: Type: text/plain, Size: 880 bytes --] 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. > 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 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: error importing i2c quilt series 2010-10-25 8:53 ` Stephen Rothwell @ 2010-10-25 9:25 ` Jean Delvare 2010-10-25 10:13 ` Stephen Rothwell 0 siblings, 1 reply; 6+ messages in thread From: Jean Delvare @ 2010-10-25 9:25 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jesse Barnes 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: error importing i2c quilt series 2010-10-25 9:25 ` Jean Delvare @ 2010-10-25 10:13 ` Stephen Rothwell 2010-10-26 9:07 ` Jean Delvare 0 siblings, 1 reply; 6+ messages in thread From: Stephen Rothwell @ 2010-10-25 10:13 UTC (permalink / raw) To: Jean Delvare; +Cc: linux-next, linux-kernel, Jesse Barnes [-- 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 --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: error importing i2c quilt series 2010-10-25 10:13 ` Stephen Rothwell @ 2010-10-26 9:07 ` Jean Delvare 0 siblings, 0 replies; 6+ messages in thread From: Jean Delvare @ 2010-10-26 9:07 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jesse Barnes Hi Stephen, On Mon, 25 Oct 2010 21:13:27 +1100, Stephen Rothwell wrote: > 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. OK, I take note. I seem to remember that last time I used NEXT_BASE, I was told that I should only use it if I really had to as it made your work more difficult and was normally not needed. Maybe I understood you wrong back then, or maybe things changed meanwhile. Either way, I'll make sure to use NEXT_BASE from now on each time this seems to be needed. -- Jean Delvare ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-10-26 9:07 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 2010-10-26 9:07 ` Jean Delvare
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox