From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of sparc tree Date: Wed, 18 Jun 2008 16:23:16 +1000 Message-ID: <20080618162316.efcba6be.sfr@canb.auug.org.au> References: <20080617172150.9ef1ea69.sfr@canb.auug.org.au> <20080617.003534.193689527.davem@davemloft.net> <20080617.223707.49467656.davem@davemloft.net> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__18_Jun_2008_16_23_16_+1000_FX6d1dbnuT=fl9EX" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:34646 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760708AbYFRGXY (ORCPT ); Wed, 18 Jun 2008 02:23:24 -0400 In-Reply-To: <20080617.223707.49467656.davem@davemloft.net> Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller Cc: geert@linux-m68k.org, linux-next@vger.kernel.org, bunk@kernel.org --Signature=_Wed__18_Jun_2008_16_23_16_+1000_FX6d1dbnuT=fl9EX Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, 17 Jun 2008 22:37:07 -0700 (PDT) David Miller = wrote: > > It's part of a tree-wide removal of CONFIG_SUN4. If Stephen doesn't > mind making this minor merge fixup all the time, it's probably > best to keep it in the sparc tree. >=20 > Let me know if you disagree :-) I don't mind. git rerere is my friend :-) --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__18_Jun_2008_16_23_16_+1000_FX6d1dbnuT=fl9EX Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhYqdQACgkQTgG2atn1QN/A1wCgmqDs3TFBJSDNZaSWEv+0dnOm RTYAnR6xm9JuTQTt88HjN75yeD+TLYFT =u3Hi -----END PGP SIGNATURE----- --Signature=_Wed__18_Jun_2008_16_23_16_+1000_FX6d1dbnuT=fl9EX--