From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933053AbaLJVie (ORCPT ); Wed, 10 Dec 2014 16:38:34 -0500 Received: from ozlabs.org ([103.22.144.67]:32841 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932698AbaLJVid (ORCPT ); Wed, 10 Dec 2014 16:38:33 -0500 Date: Thu, 11 Dec 2014 08:38:23 +1100 From: Stephen Rothwell To: David Miller Cc: netdev@vger.kernel.org, Thomas.Lendacky@amd.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20141211083823.5271cc20@canb.auug.org.au> In-Reply-To: <20141210.144943.1497210993149601967.davem@davemloft.net> References: <20141210122036.133457c9@canb.auug.org.au> <20141210.144943.1497210993149601967.davem@davemloft.net> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/dR=wLR1tP51AGRe_Ap370Og"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/dR=wLR1tP51AGRe_Ap370Og Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Dave, On Wed, 10 Dec 2014 14:49:43 -0500 (EST) David Miller = wrote: > > As you have seen there are a lot of merge hassles to sort out between > the 'net' and 'net-next' tree right now, probably I just added a few > more :-) >=20 > I'll try to do the merge by the end of today so that these headaches > go away for you. Much appreciated. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/dR=wLR1tP51AGRe_Ap370Og Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUiL1UAAoJEMDTa8Ir7ZwVbpwP/iNLf7nxUjY9ZD7S5MwBCW2s /fTdQOGyGe44uq3WQE5R4MBxygaDBgw0V2dwyLMxapbs2otqcmwJCJgMS0MYPFP6 2GGu+8pzJbswDdJCw5NkXxNADNX0TSz8XKjoIFAduC0buZd85VuM/1m2+27v1isz yXQ2H7rI0/VkYmnIGpLtDzlf8+iR0MJP7Y6Cxi9rb632obqBJS5Y6z/6Z8aSrUl1 xuOro8rcPSvtJVe5dcgzEg2WXSLi4j81qh0Yw1dY4hI9k+qexjo6PzGW4Qv5N9De m6O74SWoV4nziZcuxPA8ZdkjUx1KY6CKq8BrtbtHzseDaau+gAJCJtZ/FGqtNVFx vWBL1hB26u7J2j4Zldxo+SwX0Sxh9YpQewhpKcIEuU2rjMfGCPt0vPV7GpVRioEj yjeVaBzzWzV09l4a6jv3UBr4XUITmQgARehsnW3Yszs4+xgB7+2rKMlYxfhfR+9O +3qY/U7W9SuM7hiEXpuH7nh8ODy9dLiuv5MsM6GD9KRy8IJRn1XMI0ywFsT4Vo0U zJLoq0bTtKjU468FspTW9ez0GLrksKn0fB/fEN0xdrIoMxlpTk3iqhqsc4cMaPjj uKuUQ9/XfZXLjzwn5SJQthtzBRA5IZRJdG9jcHKnq70DZABK0AkYYB7wYU4Ytf/l 3DVoAP0nlWQ7/Pd95Kwd =2yfJ -----END PGP SIGNATURE----- --Sig_/dR=wLR1tP51AGRe_Ap370Og--