Re: [PATCH 11/12] Generic semaphore implementation

Andrew Morton
2008-02-29T02:11:29Z

On Fri, 29 Feb 2008 13:00:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> On Thu, 28 Feb 2008 17:39:54 -0700 Matthew Wilcox <matthew@wil.cx> wrote:
> >
> > Stephen, I've put the semaphore patches into a git tree; can you add it
> > to linux-next?
> >
> > http://git.kernel.org/?p=linux/kernel/git/willy/misc.git;a=shortlog;h=semaphore
>
> 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.