From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751206Ab1ECEVM (ORCPT ); Tue, 3 May 2011 00:21:12 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:52310 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759Ab1ECEVK (ORCPT ); Tue, 3 May 2011 00:21:10 -0400 Date: Tue, 3 May 2011 14:21:02 +1000 From: Stephen Rothwell To: David Miller Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, rjw@sisk.pl, joe@perches.com Subject: Re: linux-next: manual merge of the net tree with the net-current tree Message-Id: <20110503142102.c3b83415.sfr@canb.auug.org.au> In-Reply-To: <20110502.204238.193708379.davem@davemloft.net> References: <20110503131548.63dd3568.sfr@canb.auug.org.au> <20110502.204238.193708379.davem@davemloft.net> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.24.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Tue__3_May_2011_14_21_02_+1000_Fng75GXNOOzjMH5/" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Tue__3_May_2011_14_21_02_+1000_Fng75GXNOOzjMH5/ Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Dave, On Mon, 02 May 2011 20:42:38 -0700 (PDT) David Miller = wrote: > > Do you automatically generate these emails? :-) Partly. > I CC:'d you on an email earlier about this conflict, in an effort to > let you know I anticipated it and you therefore didn't need to notify > us this time. I must have missed that (or missed its implications), sorry. /me searches his trash ... ah, there it is ... I obviously didn't read it well enough or notice the cc. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__3_May_2011_14_21_02_+1000_Fng75GXNOOzjMH5/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBAgAGBQJNv4KuAAoJEDMEi1NhKgbsEAMH/jr3NI9SHXCakTCzUH2k/7r7 dT6g7QcOLgHoGuJlwSxtduuj1i6YPZYEFQlSVoJZoGqCyspt0eTOiaEIikHpfEFw ZSF6dyI0bCuX1PY1oU8MdKU02ceSXCRx3gvV4QNHBL4TB99t9dax+cj4x/mGkDBK j1pSLKL9L0kj2ezfeiGTTQe8tdglegL1cvd4MtgEF7cxOJ1dqYJ88VTQLyGMTBw9 3E6UzRG6OcwCchr0r1Ypw6yaGUhCRD58PZSyuPFi27yYynQBpkkI0WONhKIWHRuQ iW4vVdo+KT14DZfcjI+gOMi9KxlRxyJp2TEqfti5DfnePZ0ccy0BkdMhKWMU38Q= =Dq0C -----END PGP SIGNATURE----- --Signature=_Tue__3_May_2011_14_21_02_+1000_Fng75GXNOOzjMH5/--