From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree
Date: Fri, 14 May 2010 16:00:10 +1000
Message-ID: <20100514160010.c5ae1d30.sfr@canb.auug.org.au>
References: <20100514100747.42445cdf.sfr@canb.auug.org.au>
	<Pine.LNX.4.64.1005132124170.25892@cobra.newdream.net>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__14_May_2010_16_00_10_+1000_+UiRu81m2lPtIuHl"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:57900 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752442Ab0ENGAQ (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 14 May 2010 02:00:16 -0400
In-Reply-To: <Pine.LNX.4.64.1005132124170.25892@cobra.newdream.net>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Sage Weil <sage@newdream.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Cheng Renquan <crquan@gmail.com>

--Signature=_Fri__14_May_2010_16_00_10_+1000_+UiRu81m2lPtIuHl
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Sage,

On Thu, 13 May 2010 21:25:45 -0700 (PDT) Sage Weil <sage@newdream.net> wrot=
e:
>
> Aie, sorry...  I rebased everything queued for the next window yesterday=
=20
> but forgot to update the for-next tag.  These conflicts should all=20
> disappear next time around.

Thanks.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__14_May_2010_16_00_10_+1000_+UiRu81m2lPtIuHl
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvs5uoACgkQjjKRsyhoI8yNSACgo9OhxVcHjGd2YjkF1rrH6MuY
tzwAnimGHjbXSsP/KK3N7x2QmmMTZEGv
=n8dr
-----END PGP SIGNATURE-----

--Signature=_Fri__14_May_2010_16_00_10_+1000_+UiRu81m2lPtIuHl--