On Thu, 28 Feb 2008 18:10:54 -0800 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > I have put this in for toady's build (but using the git URL). This tree > > is in the "too many conflicts and its out until fixed" category ... > > A shame. > > Most of the conflicts will be due to all the > > -#include <asm/semaphore.h> > +#include <linux/semaphore.h> > > but they're all optional anyway, because include/asm-*/semaphore.h is > > #include <linux/semaphore.h> > > so either a) you just ignore all those conflicts or b) we ask Willy to > remove all that stuff and we can trickle it in via subsystems later. My conflict tolerance is already rising. i.e. I will fix up such trivial to fix conflicts. I am more concerned with complexity of conflicts than mere number (so "too many conflicts" should be read as "too many conflicts that I can't figure out in a shortish period of time"). If it gets too bad, it falls into Linus' "the person who changes the APIs bears the pain" basket. :-) -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpw8bKSvVIsl.pgp
Description: PGP signature
