From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Sat, 26 Sep 2009 11:01:58 +1000 > Today's linux-next merge of the sparc-current tree got a conflict in > arch/sparc/include/asm/vio.h between commit > 8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a > couple of bogus uses of it") from Linus' tree and commit > 87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON > () in vio_dring_avail()") from the sparc-current tree. > > I just used the sparc-current version for today. Thanks Stephen. When Linus pulled in my tree he resolved the merge conflict and thus you shouldn't have to deal with this any more either. -- 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