From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758108Ab0EUGtk (ORCPT ); Fri, 21 May 2010 02:49:40 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:51086 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753294Ab0EUGti (ORCPT ); Fri, 21 May 2010 02:49:38 -0400 Date: Fri, 21 May 2010 16:49:26 +1000 From: Stephen Rothwell To: ebiederm@xmission.com (Eric W. Biederman) Cc: Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Herbert , David Miller , Subject: Re: linux-next: manual merge of the driver-core tree with the net tree Message-Id: <20100521164926.2c63c442.sfr@canb.auug.org.au> In-Reply-To: References: <20100521162134.6b6326bd.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__21_May_2010_16_49_26_+1000_QP67q2TFJRByna.R" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Fri__21_May_2010_16_49_26_+1000_QP67q2TFJRByna.R Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Eric, On Thu, 20 May 2010 23:46:22 -0700 ebiederm@xmission.com (Eric W. Biederman= ) wrote: > > It looks right, except perhaps the RPS code looks like it will cause a > build failure with sysfs disabled, but that has nothing to do with your > changes. I don't see any real conflicts here, just two patches passing > very close to each other. Thanks for the confirmation. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__21_May_2010_16_49_26_+1000_QP67q2TFJRByna.R Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkv2LPYACgkQjjKRsyhoI8yyYgCZAZH74AlUEJnznwNszJjYMoj/ ESMAnRhsbTRi2j/4OidK0IaqdQu3eMse =lNWI -----END PGP SIGNATURE----- --Signature=_Fri__21_May_2010_16_49_26_+1000_QP67q2TFJRByna.R--