Russell, On Sat, Dec 05, 2009 at 10:28:16AM +0000, Russell King - ARM Linux wrote: > On Sat, Dec 05, 2009 at 10:56:33AM +0100, Dominik Brodowski wrote: > > Russell, > > > > On Fri, Dec 04, 2009 at 05:24:17PM +0000, Russell King - ARM Linux wrote: > > > For the time being, I'll merge your patch into my git tree, but unless > > > Dominik hands my patches back to me for merging, it will be lost. > > > > your patches -- which you asked me to merge and push upstream -- are on > > their way to Linus. I'll merge this bugfix to your patch later and push it > > upstream, too, unless you prefer to do that independently. > > Yes I did at the time, but things change. Since you've been totally silent > on the merge conflicts between your PCMCIA tree and my tree which SFR > reported on December 1st:
Well, as this was an addition through your tree, I didn't consider it neccessary to comment on it. > | Hi Dominik, > | > | Today's linux-next merge of the pcmcia tree got a conflict in > | drivers/pcmcia/sa1100_h3600.c between commit > | 6ce8f65e71f0d80ee23b543be09789dd865a99be ("ARM: 5811/1: pcmcia: convert > | sa1100_h3600 driver to gpiolib") from the arm tree and commit > | 66024db57d5b9011e274b314affad68f370c0d6f ("PCMCIA: stop duplicating > | pci_irq in soc_pcmcia_socket") from the pcmcia tree. > | > | I fixed it up (see below) and can carry the fix as necessary. Please > | check the fix below. > ... > > To which there was this reply: > | Fix looks good to me, and testing next-20091201 on real device (h3600) > | shows no problems with pcmcia. > | > | Perhaps this merge conflict can be avoided by merging Russell's PCMCIA > | patches through arm tree. But, anyway, it's Russell and Dominik > | to decide. > > And a reply from me agreeing that it would probably make more sense in > light of this for my patches to go through my tree. Well, another option would have been to merge the other changes to drivers/pcmcia/ via PCMCIA -- something which has not even been suggested. More and more I think some if not all PCMCIA socket drivers should reside in subdirectories to drivers/pcmcia/ . > This is no longer possible, so I'm going to kick out the conflicting code > for the time being. The conflicting stuff can be merged at some later > date once this kind of issue is solved. That's one option, yes. Best, Dominik _______________________________________________ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia