From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the md tree Date: Thu, 16 Oct 2008 17:13:00 +1100 Message-ID: <20081016171300.bb2184ff.sfr@canb.auug.org.au> References: <20081015193413.90ec9792.sfr@canb.auug.org.au> <18677.52086.914687.271000@notabene.brown> <20081016170757.87ccb3bf.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__16_Oct_2008_17_13_00_+1100_0QbUXyzfqDEJq8MO" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:38423 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755332AbYJPGNJ (ORCPT ); Thu, 16 Oct 2008 02:13:09 -0400 In-Reply-To: <20081016170757.87ccb3bf.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Neil Brown Cc: linux-next@vger.kernel.org, Denis ChengRq , Jens Axboe , Tejun Heo , Andre Noll --Signature=_Thu__16_Oct_2008_17_13_00_+1100_0QbUXyzfqDEJq8MO Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Neil, On Thu, 16 Oct 2008 17:07:57 +1100 Stephen Rothwell = wrote: > > On Wed, 15 Oct 2008 21:52:38 +1100 Neil Brown wrote: > > > > I pushed out a new for-next just a couple of hours before I got this > > email which resolves that, so the conflict should disappear in your > > next merge. >=20 > Thanks for that. Unfortunately, neil.brown.name was unresolvable this > morning so it will have to wait for tomorrow. Actually I just managed to fetch it now, so it will make today's tree (if I finish it :-(). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__16_Oct_2008_17_13_00_+1100_0QbUXyzfqDEJq8MO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkj222wACgkQjjKRsyhoI8xvuQCdHB9iJNMMgK/+zsm5WF8VJx3+ 5uEAn0uBJRVLQQWFOIyRd2E1sjQGrHPS =KhEN -----END PGP SIGNATURE----- --Signature=_Thu__16_Oct_2008_17_13_00_+1100_0QbUXyzfqDEJq8MO--