Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753836AbYHKXjf (ORCPT ); Mon, 11 Aug 2008 19:39:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753692AbYHKXjY (ORCPT ); Mon, 11 Aug 2008 19:39:24 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:37931 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755564AbYHKXjX (ORCPT ); Mon, 11 Aug 2008 19:39:23 -0400 Date: Tue, 12 Aug 2008 09:39:11 +1000 From: Stephen Rothwell To: Steven French Cc: James Morris , "David S. Miller" , David Howells , linux-kernel@vger.kernel.org Subject: Re: Resolved merge conflicts in next-creds Message-Id: <20080812093911.36bc21d3.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=_Tue__12_Aug_2008_09_39_11_+1000_33vaMVWTK..Cd3u1" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1171 Lines: 38 --Signature=_Tue__12_Aug_2008_09_39_11_+1000_33vaMVWTK..Cd3u1 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Steve, On Mon, 11 Aug 2008 09:51:28 -0500 Steven French wrote: > > These (cifs) changes should be in Linus's mainline now so should be easie= r=20 > to merge your patch now. Yeah, the conflicts were no longer in yesterday's linux-next merge. Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__12_Aug_2008_09_39_11_+1000_33vaMVWTK..Cd3u1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkigzZ8ACgkQjjKRsyhoI8w/bwCdFwsf5X20gzdn9nRUmvWhlKX7 F6QAoJtgpOe6o5/mbEr71km/u/+EWzA4 =Viap -----END PGP SIGNATURE----- --Signature=_Tue__12_Aug_2008_09_39_11_+1000_33vaMVWTK..Cd3u1-- -- 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/