Re: linux-next: Tree for March 5

From: David Miller
Date: Wed Mar 05 2008 - 18:02:28 EST


From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 5 Mar 2008 20:47:08 +1100

> We are up to 42 trees, more are welcome (even if they are currently
> empty). The influx of new trees has been underwhelming. Thanks to those
> who have contributed, and to those who haven't, please do.

Feel free to start pulling in:

git://git.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.26.git#master

I just did a test pull into the current linux-next.

There was one conflict, net/tipc/socket.c, which has been converted
from semaphores to mutexes. It conflicts with the generic semaphores
change, and essentially you can simply remove the generic semaphore
modifications to this file when you build the next tree since the
net-2.6.26 tree changes these TIPC bits to not use semaphores any
more.

The result builds cleanly allmodconfig on sparc64.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/