Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753055AbYHNDLs (ORCPT ); Wed, 13 Aug 2008 23:11:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751457AbYHNDLk (ORCPT ); Wed, 13 Aug 2008 23:11:40 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:53007 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbYHNDLj (ORCPT ); Wed, 13 Aug 2008 23:11:39 -0400 Date: Thu, 14 Aug 2008 13:11:30 +1000 From: Stephen Rothwell To: James Morris Cc: lachlan@sgi.com, linux-kernel@vger.kernel.org, David Howells Subject: Re: Resolved XFS conflict in next-creds Message-Id: <20080814131130.33739aea.sfr@canb.auug.org.au> In-Reply-To: References: X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__14_Aug_2008_13_11_30_+1000_wAda7M7qGVVDjIZW" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1190 Lines: 38 --Signature=_Thu__14_Aug_2008_13_11_30_+1000_wAda7M7qGVVDjIZW Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi James, On Thu, 14 Aug 2008 12:42:55 +1000 (EST) James Morris w= rote: > > I resolved the following conflict with Linus' tree in: > git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.= 6#next-creds Thanks. I have fetched it for today's linux-next. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__14_Aug_2008_13_11_30_+1000_wAda7M7qGVVDjIZW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkijomIACgkQjjKRsyhoI8yNUwCgjcQWnkn6h25TGv6UGlzl7xmj VvcAni6hYy1hiYNM1q7frAPL+zg6qoFm =Cros -----END PGP SIGNATURE----- --Signature=_Thu__14_Aug_2008_13_11_30_+1000_wAda7M7qGVVDjIZW-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/