On Wednesday 22 July 2009 06:59:17 Stephen Rothwell wrote: > Hi Lars, > > On Tue, 21 Jul 2009 20:51:56 +0200 Lars Ellenberg <lars.ellenberg@xxxxxxxxxx> wrote: > > Stephen: expect an explicit linux-next merge request > > within the next few days. > > OK, just to be clear your tree should be based on Linus' tree (or some > other *stable*, non rebasing, tree - *not* linux-next). > Hi Stephen, Please add git://git.drbd.org/linux-2.6-drbd.git to linux-next. The tree was initially based on v2.6.30-rc1. Later 2.6.31-rc1 was merged in. I verified that it still merges with 2.6.31-rc4 without conflicts. Thanks! -Philipp -- : Dipl-Ing Philipp Reisner : LINBIT | Your Way to High Availability : Tel: +43-1-8178292-50, Fax: +43-1-8178292-82 : http://www.linbit.com DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria. -- 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