Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755265Ab0BAX0F (ORCPT ); Mon, 1 Feb 2010 18:26:05 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:40236 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754482Ab0BAX0B (ORCPT ); Mon, 1 Feb 2010 18:26:01 -0500 Date: Tue, 2 Feb 2010 10:25:55 +1100 From: Stephen Rothwell To: Jason Wessel Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the tip tree with the kgdb tree Message-Id: <20100202102555.79a8f8c9.sfr@canb.auug.org.au> In-Reply-To: <4B66F752.1070001@windriver.com> References: <20100201172952.95fe2150.sfr@canb.auug.org.au> <4B66F752.1070001@windriver.com> X-Mailer: Sylpheed 3.0.0beta6 (GTK+ 2.18.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Tue__2_Feb_2010_10_25_55_+1100_kGQVm=h4yLRMD+Fw" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1216 Lines: 43 --Signature=_Tue__2_Feb_2010_10_25_55_+1100_kGQVm=h4yLRMD+Fw Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jason, On Mon, 01 Feb 2010 09:46:26 -0600 Jason Wessel wrote: > > What is in tip is the correct version. OK, good. > It is the age old time dependency of who updates whose tree first, vs > when the linux-next merge runs. At any rate this is already resolved. Even better :-) Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__2_Feb_2010_10_25_55_+1100_kGQVm=h4yLRMD+Fw Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAktnYwMACgkQjjKRsyhoI8x1aACfRsaaf87/cJzZiXd5/NU8QngY 1OgAoLiaKm6wQoMERE0sNZsbqoJs9oR+ =itk+ -----END PGP SIGNATURE----- --Signature=_Tue__2_Feb_2010_10_25_55_+1100_kGQVm=h4yLRMD+Fw-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/