Prev: linux-next: build failure after merge of the xen tree
Next: x86, memblock: Add memblock_x86_find_in_range_size()
From: Stephen Rothwell on 28 Jul 2010 00:40
Hi all,

Today's linux-next merge of the tip tree got some complex a conflicts in
arch/powerpc/kernel/time.c between a couple of commits from the powerpc
tree and a set of commits from the tip tree.

Since John has posted a new revision of the patches that are in the tip
tree that will resolve these conflicts. I just used the tip tree from
next-20100727 for today (and hope this will be better tomorrow).
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
 | 
Pages: 1
Prev: linux-next: build failure after merge of the xen tree
Next: x86, memblock: Add memblock_x86_find_in_range_size()