Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752990AbbFAL5Q (ORCPT ); Mon, 1 Jun 2015 07:57:16 -0400 Received: from ozlabs.org ([103.22.144.67]:48417 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751360AbbFAL4n (ORCPT ); Mon, 1 Jun 2015 07:56:43 -0400 Date: Mon, 1 Jun 2015 21:56:35 +1000 From: Stephen Rothwell To: "Nicholas A. Bellinger" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Andy Grover Subject: Re: linux-next: manual merge of the target-updates tree with the tree Message-ID: <20150601215635.5988fcf7@canb.auug.org.au> In-Reply-To: <1433158552.3170.36.camel@haakon3.risingtidesystems.com> References: <20150601212220.7374cc23@canb.auug.org.au> <1433158552.3170.36.camel@haakon3.risingtidesystems.com> 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_/fa7LnLwrTDdT/AfS_XVzXuw"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1729 Lines: 48 --Sig_/fa7LnLwrTDdT/AfS_XVzXuw Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Nicholas, On Mon, 01 Jun 2015 04:35:52 -0700 "Nicholas A. Bellinger" wrote: > > Apologies for the conflicts vs. mainline in today's linux-next >=20 > The latest in target-pending/for-next from this morning should address > these conflicts vs. mainline. Thanks, tomorrow should be better :-) --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/fa7LnLwrTDdT/AfS_XVzXuw Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVbEh5AAoJEMDTa8Ir7ZwVek8QAIpRMu+xybIdQodK5e35GxBg bF6vQ3gCjyDpKlyJxy2zZGG+VGwjllIwfOK7GcGBAwNDNqJaSZNsMqlKZZgByxgW eNiC3win+Qfp5ObBKwqJEyXgdqt45scLLQTHPJpfw7hMKb0dkzNU9DGfSizef+vr yJBPDGtFD71zikZ7+/PsR/eKWyfEIJ1/D92bq1pqL+O+4tV5ruFvKyvuFUBkDMPr wNakQRYESWlKNRECJejpqZSGYQWqMvEq6kByTc3cStn0RK1NUTPbUnrbMuoP8hYl eqpbNM6ZSA53aaP1y5ZHEmJmcx7mYe9TjcPqhEdlvprkOTTetq2EgsW+P3FLoHJP tv8WVp/+9ASrfbvFxupbvqtzty2jfiGNWRzCI++DVL/uoJnWQNFw+dplw7vJKbng gIt3EP+L38YTRDZuhF3R30p0GdwTE9oxsTzesQFIyPflNLyNqRAOyMB9Ivz2evlr UAa6RSgJWp3qgV7VVFo9JLMrKx6/+WYuaGmbsQba4B2t0rpC4VRx2nj7HF7YJgbp tIHeeSnvzww0YtxneM1AFXeCVONU70NJUNcHOjqkMEZp+W120/XPwFSYlwEt5bTH ZVDoYBYv2IVQJL7IsibvZVUvQfx6G8pTHp+yQ4azSjdsHMFB8TqYfefxhbJx/elz M5w5PQ691QnDNfWDUCwx =L6Q2 -----END PGP SIGNATURE----- --Sig_/fa7LnLwrTDdT/AfS_XVzXuw-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/