From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935717Ab1JFGQP (ORCPT ); Thu, 6 Oct 2011 02:16:15 -0400 Received: from calzone.tip.net.au ([203.10.76.15]:50326 "EHLO calzone.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933935Ab1JFGQL (ORCPT ); Thu, 6 Oct 2011 02:16:11 -0400 Date: Thu, 6 Oct 2011 17:16:02 +1100 From: Stephen Rothwell To: David Miller Cc: greg@kroah.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ian.Campbell@citrix.com, netdev@vger.kernel.org, mark.einon@gmail.com Subject: Re: linux-next: manual merge of the staging tree with the net tree Message-Id: <20111006171602.ed7c564407b617547c49944b@canb.auug.org.au> In-Reply-To: <20111006.015622.2047301950614681216.davem@davemloft.net> References: <20111006160433.44de2a1374b6ec4efc97e04e@canb.auug.org.au> <20111006.015622.2047301950614681216.davem@davemloft.net> X-Mailer: Sylpheed 3.2.0beta3 (GTK+ 2.24.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__6_Oct_2011_17_16_02_+1100_k+uPAecerl6ThW_H" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Thu__6_Oct_2011_17_16_02_+1100_k+uPAecerl6ThW_H Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Dave, On Thu, 06 Oct 2011 01:56:22 -0400 (EDT) David Miller = wrote: > > Yep, we saw this one coming too. I think you'll need to carry this one > until the merge window flushes out. Sure, no problem. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__6_Oct_2011_17_16_02_+1100_k+uPAecerl6ThW_H Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJOjUeiAAoJEECxmPOUX5FEiVgP/imn9rIIUsW2/AlvVGjfWjrV KWXz6CDu/NlVlEDlu25lJiCkWjar7QeCe0rLE4OxkumgtR0P0PeWQLAW4g+fDekz /8DvBHpe6qwft8G+jP2bqcmiyuZ267om0jDNRPXThR4GEgPcwx6OsPqeVIwN5ayZ c7ydubfD3epC+i85y/IdNVB5vKzMXbVLUMOYg1pwHp1otXIeAXTjxPhlqbfkWVey sMx+h/t9HejNwHvyBsF0FZ7x+wy6r96R0vzwRTSjurbGFSEWL9P1+bczAER/ti54 4tamci8TiNRjapu5B451etUbtjMgBV0MkAl5b1VjHf/TmFM27JTYpTGoOFG22pw6 X0+IoXq/YcUOnPTKcXZwjwH/1VeMoxcRsSnCvyFViyEToXyXBp0ZeM+FsnRtcrhr xLCg6vyX2U2bfipXi9G5ZmXb/vHbcLMXzCl7tv8DuI+hjNzT2d7odnkOAeAhWSHM GaCL2Q8uSlZJTboKR8A+IAN/3pi36uBJkvOgs5IGE4V5vWSKYA79ZVO15zuY/kws khnkyRrfmmRQ3A4W93q4uvNOjjHiwuTu/IBzykaPRFum4juBuQg3QQu2dw9/4+JR fpIDkYYrX3hDr8e6vkvlAjLd3lYdFb9OVwdtGB5Lxjox+rPnDZTrns0ZQxMDuPqA SiIPZTeePf5WYpK+sFsq =0axk -----END PGP SIGNATURE----- --Signature=_Thu__6_Oct_2011_17_16_02_+1100_k+uPAecerl6ThW_H--