From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the ttydev tree with the usb.current tree Date: Tue, 28 Apr 2009 16:45:44 +1000 Message-ID: <20090428164544.516867e0.sfr@canb.auug.org.au> References: <20090422133821.804bf9d6.sfr@canb.auug.org.au> <20090422173009.4b6e684e@lxorguk.ukuu.org.uk> <20090422163857.GA19484@kroah.com> <20090428144256.f7870238.sfr@canb.auug.org.au> <20090428045828.GB11810@kroah.com> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Tue__28_Apr_2009_16_45_44_+1000_oXPnD.lmU.hyOSie" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:60045 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754206AbZD1Gp7 (ORCPT ); Tue, 28 Apr 2009 02:45:59 -0400 In-Reply-To: <20090428045828.GB11810@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: Alan Cox , Alan Stern , linux-next@vger.kernel.org --Signature=_Tue__28_Apr_2009_16_45_44_+1000_oXPnD.lmU.hyOSie Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Greg, On Mon, 27 Apr 2009 21:58:28 -0700 Greg KH wrote: > > It's all in Linus's tree, and has been for a few days now. Are you > still getting merge errors? Oops, wrong target :-) Yes, I am still getting merge conflicts, but they are obviously Alan's problem, now. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__28_Apr_2009_16_45_44_+1000_oXPnD.lmU.hyOSie Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkn2phgACgkQjjKRsyhoI8yZugCfQQP0+oS46dl689k8M/GHcxTa hncAn0lfnjF6YhZw3XC8PbOPal+D1ryI =SwC/ -----END PGP SIGNATURE----- --Signature=_Tue__28_Apr_2009_16_45_44_+1000_oXPnD.lmU.hyOSie--