From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the sparc-current tree with Linus' tree Date: Sat, 26 Sep 2009 11:01:58 +1000 Message-ID: <20090926110158.0fcd2763.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Sat__26_Sep_2009_11_01_58_+1000_esQFDqsmjiMB.Jz/" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:54723 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750AbZIZBCD (ORCPT ); Fri, 25 Sep 2009 21:02:03 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Beulich , Andrew Morton --Signature=_Sat__26_Sep_2009_11_01_58_+1000_esQFDqsmjiMB.Jz/ Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Sat__26_Sep_2009_11_01_58_+1000_esQFDqsmjiMB.Jz/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkq9aAYACgkQjjKRsyhoI8zaKQCfZtITbifdPgkvUpxhVdrGNEfr m8QAniYlQAiM4h3mxAW/o2UYwkecdWl1 =YG2N -----END PGP SIGNATURE----- --Signature=_Sat__26_Sep_2009_11_01_58_+1000_esQFDqsmjiMB.Jz/--