From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1760690AbZLJLOR@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1760690AbZLJLOR (ORCPT <rfc822;w@1wt.eu>);
	Thu, 10 Dec 2009 06:14:17 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760631AbZLJLOO
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 10 Dec 2009 06:14:14 -0500
Received: from chilli.pcug.org.au ([203.10.76.44]:60960 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1760597AbZLJLON (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 10 Dec 2009 06:14:13 -0500
Date: Thu, 10 Dec 2009 22:14:06 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       Damian Lukowski <damian@tvk.rwth-aachen.de>,
       David Miller <davem@davemloft.net>, netdev@vger.kernel.org,
       =?UTF-8?B?IkFuZHLDqSBHb2RkYXJkIFJvc2Ei?= <andre.goddard@gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the
 net-current tree
Message-Id: <20091210221406.94b1aaaf.sfr@canb.auug.org.au>
In-Reply-To: <alpine.LNX.2.00.0912100944250.3755@pobox.suse.cz>
References: <20091210143756.5a236829.sfr@canb.auug.org.au>
	<alpine.LNX.2.00.0912100944250.3755@pobox.suse.cz>
X-Mailer: Sylpheed 3.0.0beta3 (GTK+ 2.18.4; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__10_Dec_2009_22_14_06_+1100_aa/OD=8Gh/EFXwcZ"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--Signature=_Thu__10_Dec_2009_22_14_06_+1100_aa/OD=8Gh/EFXwcZ
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jiri,

On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrot=
e:
>
> Linus has merged trivial tree into his tree tonight, so I am afraid that=
=20
> davem will have to fix the conflict when pulling Linus tree into=20
> net-current.

Yep, or Linus can fix it if he feels inclined.

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

--Signature=_Thu__10_Dec_2009_22_14_06_+1100_aa/OD=8Gh/EFXwcZ
Content-Type: application/pgp-signature

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

iEYEARECAAYFAksg1/4ACgkQjjKRsyhoI8wfFwCggHUB4DJz1fs4IfT2PBSjFHu7
2soAoIqdZ4I2NAMpJ6R1S+KHx4ZgoEki
=S8hO
-----END PGP SIGNATURE-----

--Signature=_Thu__10_Dec_2009_22_14_06_+1100_aa/OD=8Gh/EFXwcZ--