From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Date: Tue, 3 Jan 2012 19:36:48 +1100 Message-ID: <20120103193648.41d4c244018182c50ff7e61b@canb.auug.org.au> References: <20120103160813.d2a8575c1de3bad0acd42280@canb.auug.org.au> <20120103080618.GA10149@elte.hu> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__3_Jan_2012_19_36_48_+1100_=udMiq8p4vU95NjL" Return-path: Received: from calzone.tip.net.au ([203.10.76.15]:36199 "EHLO calzone.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751462Ab2ACIhF (ORCPT ); Tue, 3 Jan 2012 03:37:05 -0500 In-Reply-To: <20120103080618.GA10149@elte.hu> Sender: linux-next-owner@vger.kernel.org List-ID: To: Ingo Molnar Cc: Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hugh Dickins --Signature=_Tue__3_Jan_2012_19_36_48_+1100_=udMiq8p4vU95NjL Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Ingo, On Tue, 3 Jan 2012 09:06:18 +0100 Ingo Molnar wrote: > > No, Linus's version is the correct resolution - i've resolved=20 > this in tip:auto-latest. Thanks for that. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__3_Jan_2012_19_36_48_+1100_=udMiq8p4vU95NjL Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPAr4gAAoJEECxmPOUX5FEx3gP/j+0yobGXvf386iY670PU8Vc HaWCwy3MkJICz/d9ujXQKhizsAwhGskDNpQqCsTFM+aqpChlO6c5WORP5p19skwo nnmET8Q7HZVMFS5Y7NchHGAqMPwU1B/Ox9tE94ufUTxMzg+wMind+WzGS4QEzWM5 llqI2pZmrNE/gS9+zANMhg+4CJX2R3XY40y7OrgeaoCr+0/g0qJDXRgyuvvO1dWs on21eXGb91BdQETiluh1BDf5WeI2tFjvWnEOBNn/lvZ7KD/cHWnptmtmYuZdcU2v Dhvd37gRwi6ZwBTcQdOApjbmDLaDTsHM7utVGaagimzfph74FxY84FxtwLIDWXwG JB5CtypBmnU6t5EqTgA+8+b8T41HFKf4KiXNp8phpG9RP8dEj+QChp5gTg3XOhgE fUAde8HPrF7I/VS9leX0AGNvIvrcMsZEINOMBYx0LUOT8FeWxs1nfLZSwmY7z/ZH HB+ZgCDJX31wKiegqJ8urTg2ObsCEQ0qBLd1dTv369/JYHAIkoTsFHA925WDTxpH MC8TnnNP2YNInEytUIjTHhFn1G+YHVg31E+bfc345572pHht0yDeYinLliiUbLu6 ryQte3APkSjduhCAhqiOrayLESIs48+l81mT63xj5jSLr/uqjckRdNgtC7Fd3nVc BvVwMlZphW6YVPe5KDC3 =+oMj -----END PGP SIGNATURE----- --Signature=_Tue__3_Jan_2012_19_36_48_+1100_=udMiq8p4vU95NjL--