From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the trivial tree with the quota tree Date: Tue, 10 Feb 2009 22:09:44 +1100 Message-ID: <20090210220944.1237741b.sfr@canb.auug.org.au> References: <20090210183438.2099164f.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Tue__10_Feb_2009_22_09_44_+1100_mPe7Iq00+nwtnzE4" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:44130 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750793AbZBJLJu (ORCPT ); Tue, 10 Feb 2009 06:09:50 -0500 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Jiri Kosina Cc: Jan Kara , linux-next@vger.kernel.org --Signature=_Tue__10_Feb_2009_22_09_44_+1100_mPe7Iq00+nwtnzE4 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jiri, On Tue, 10 Feb 2009 10:42:17 +0100 (CET) Jiri Kosina wrot= e: > > Thanks for notification Stephen. I have dropped the conflicting hunk from= =20 > my tree now. Jan, could you please take the patch below through your tree= ?=20 Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__10_Feb_2009_22_09_44_+1100_mPe7Iq00+nwtnzE4 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkmRYHgACgkQjjKRsyhoI8yTBQCfdjl+nLp7T0PFsWoaf5PNZ6CE hhYAmwWzNU+MR0dl36OaMe/NnftLy9KW =YCtL -----END PGP SIGNATURE----- --Signature=_Tue__10_Feb_2009_22_09_44_+1100_mPe7Iq00+nwtnzE4--