On Wed, 2009-06-10 at 08:20 -0700, Linus Torvalds wrote: > > On Wed, 10 Jun 2009, James Bottomley wrote: > > > > If I go the merge point route, I get a tree with more non trivial merge > > points than commits, so it becomes incredibly difficult for anyone to > > follow what's going on. I also can no longer use git-email to send my > > patch series anywhere. > > Why do you need to merge at all? > > Do you get constant conflicts? If so, _that_ is likely the problem. Pretty much, yes. The problem isn't in the voyager code, it's in the residual subarchitecture clean up. As the x86 tree evolves, that's what keeps conflicting mainly because adjacent areas get altered. Once that's upstream, the voyager piece should be a smooth ride. The other piece that gets conflicts is the fact that voyager needs two additions to the quirks and smp ops pointer indirections to cope with some of it's unique features ... these have all been over linux-scsi several times, with feedback from the affected users. However, while they remain out of tree, there another source of conflict. > The rule should be that you should _never_ need to merge from Ingo or me, > and things should be smooth. And if there are too frequent conflicts for > that to work, then the rule should be that things get cleaned up so that > those conflicts don't happen! > > Constant rebasing, or constant merging, is a symptom of something simply > not working. It's probably why Ingo is fed up with Voyager in the first > place. Can you guys just start telling me what the actual maintenance > problem is? Where do you actually step on each others toes? What are the > conflicts? Why is Voyager so special? Once the last piece of the subarchitecture is removed and the pieces needed to support voyager are in, that should be it. The two additional pieces are: 1. prefill_possible_map initialisation ... voyager boots with a non apic config, so it needs to prefill the possible map from its VIC CPU registers 2. indirection of hard_smp_processor_id() ... voyager doesn't have an apic, so it has to read a special VIC register instead. There's also an addition to the boot code to make voyager detection dynamic instead of static based on subarchitecture. James -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
