From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753904Ab0CZCso (ORCPT ); Thu, 25 Mar 2010 22:48:44 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:34577 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753229Ab0CZCsn (ORCPT ); Thu, 25 Mar 2010 22:48:43 -0400 Date: Fri, 26 Mar 2010 13:48:36 +1100 From: Stephen Rothwell To: Jesse Barnes Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: Re: linux-next: manual merge of the pci tree with the pci-current tree Message-Id: <20100326134836.ebe45694.sfr@canb.auug.org.au> In-Reply-To: <20100325191049.18020272@jbarnes-piketon> References: <20100326115712.2d800053.sfr@canb.auug.org.au> <20100325191049.18020272@jbarnes-piketon> X-Mailer: Sylpheed 3.0.1 (GTK+ 2.18.9; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__26_Mar_2010_13_48_36_+1100_4ggyYe3QGkW8c9zW" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Fri__26_Mar_2010_13_48_36_+1100_4ggyYe3QGkW8c9zW Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jesse, On Thu, 25 Mar 2010 19:10:49 -0700 Jesse Barnes = wrote: > > Time to rebase my -next branch onto my for-linus branch again I guess. Any reason you wouldn't just merge your for-linus branch into your -next br= anch? --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__26_Mar_2010_13_48_36_+1100_4ggyYe3QGkW8c9zW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkusIIQACgkQjjKRsyhoI8wZpwCghUVt96bvenmq05KRZqtg4Dci BEwAniek8Bt/3rDLJkm5uA4c79lN4nmE =fVkA -----END PGP SIGNATURE----- --Signature=_Fri__26_Mar_2010_13_48_36_+1100_4ggyYe3QGkW8c9zW--