From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the rr tree with Linus' tree Date: Mon, 6 Jul 2009 12:05:58 +1000 Message-ID: <20090706120558.3b8cc5cd.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Mon__6_Jul_2009_12_05_58_+1000_Kxr_Qn2oR2nSwPi3" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:42767 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753150AbZGFCGG (ORCPT ); Sun, 5 Jul 2009 22:06:06 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Rusty Russell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tim Anderson , Ralf Baechle , Mike Travis --Signature=_Mon__6_Jul_2009_12_05_58_+1000_Kxr_Qn2oR2nSwPi3 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Rusty, Today's linux-next merge of the rr tree got a conflict in arch/mips/kernel/smp-cmp.c between commit 0365070f05f12f1648b4adf22cfb52ec7a8a371c ("MIPS: CMP: activate CMP support") from Linus' tree and commit e7cb633472a7c3b197e2696e6a3d19a981e8988f ("cpumask:use-cpumap-accessors-mips") from the rr tree. The former removes the code that the latter modifies in this file, so I used the former version. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Mon__6_Jul_2009_12_05_58_+1000_Kxr_Qn2oR2nSwPi3 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkpRXAYACgkQjjKRsyhoI8y3uACgjjkO2JoiQTCOvDBgqh34tTSR QUIAn0iNCtzRZb8gP1CpChi4MAAouLH5 =59KZ -----END PGP SIGNATURE----- --Signature=_Mon__6_Jul_2009_12_05_58_+1000_Kxr_Qn2oR2nSwPi3--