[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090926110158.0fcd2763.sfr@canb.auug.org.au>
Date: Sat, 26 Sep 2009 11:01:58 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Jan Beulich <JBeulich@...ell.com>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the sparc-current tree with Linus' tree
Hi David,
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.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists