From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: pci/driver-core merge conflicts Date: Fri, 30 May 2008 10:53:43 +1000 Message-ID: <20080530105343.ba29a81c.sfr@canb.auug.org.au> References: <20080529121847.fcc81e2f.sfr@canb.auug.org.au> <20080529025957.GA13909@kroah.com> <200805290857.16581.jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__30_May_2008_10_53_43_+1000_iTixWyks8rYKSHzj" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:36249 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbYE3Ax7 (ORCPT ); Thu, 29 May 2008 20:53:59 -0400 In-Reply-To: <200805290857.16581.jbarnes@virtuousgeek.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Jesse Barnes Cc: Greg KH , linux-next@vger.kernel.org, Kay Sievers , "Rafael J. Wysocki" --Signature=_Fri__30_May_2008_10_53_43_+1000_iTixWyks8rYKSHzj Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jesse, On Thu, 29 May 2008 08:57:16 -0700 Jesse Barnes = wrote: > > Hm, I knew this would cause problems eventually. :) Should I put these f= ixups=20 > in my tree? Or can you track them somehow, Stephen? Tracking these in my tree is ok in the short term as "git rerere" tracks them for me. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__30_May_2008_10_53_43_+1000_iTixWyks8rYKSHzj Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIP1AcTgG2atn1QN8RAoToAJ9+xSd+hyQB/IjlVtm8T3Vz5Vv0hACeMvwH zYdVfNwL3wCI0n5MsCSCuTE= =PGH0 -----END PGP SIGNATURE----- --Signature=_Fri__30_May_2008_10_53_43_+1000_iTixWyks8rYKSHzj--