Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752195AbbFALWg (ORCPT ); Mon, 1 Jun 2015 07:22:36 -0400 Received: from ozlabs.org ([103.22.144.67]:58912 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbbFALW1 (ORCPT ); Mon, 1 Jun 2015 07:22:27 -0400 Date: Mon, 1 Jun 2015 21:22:20 +1000 From: Stephen Rothwell To: "Nicholas A. Bellinger" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Andy Grover Subject: linux-next: manual merge of the target-updates tree with the tree Message-ID: <20150601212220.7374cc23@canb.auug.org.au> 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_/_DpomABS8KWiykD5y.e09gs"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1590 Lines: 42 --Sig_/_DpomABS8KWiykD5y.e09gs Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Nicholas, Today's linux-next merge of the target-updates tree got so many conflicts against Linus' tree that I just gave up and dropped it completely. Please fix up this mess. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/_DpomABS8KWiykD5y.e09gs Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVbEBxAAoJEMDTa8Ir7ZwVO4YP/jtezMKJwv1LFyDmytWOQH/A gmGO1CikXVTSPUlxns8ev1qzdi/1pUfXKxOy+DRk6BkU8IRA2JVFrbHohRbQPQce RtAmYlDln69j/SaB5lIQEdTBf2v4Hvsymi+RAJTmXmZe3qZHSum59L1+/y/NQOlM AdvB+KBzjCb9SLtD+O1PUb0WF0PEUpN8kMlfwxEsju3cPz6RQOufU4tHU4wZMIYl nLs70rfIasqqkBdf35ECnvHobctNj/HIWcq7FRJ6Xsr2VRtfW4kVHDqiRkf3gvpX HDhtbHVMmuT8BLXOQLp1QD7yJ5UoGgbrWo5TAAg4ZuP/i+XX2miJ2zybQat1YPNp EfTHWskupIKB580QhEOCQFcWkD+f6FBEcu3qfFQVzapP+GeQ23fn0dcbw/Br5oGz UOWg7bPXL/wW5W+Zq5M8Y3uQiVZlR11LMzp4t9OrRoARYsYfVjWtA4SFKDFoIlUb i3Paf3+BdE56q5Thj6QxmluRW1i+7oydzjTBQsYHA5sKk6iH/UoC5eFBswADt3vk cBL1EBzHmRhht4Xrh63I3U9IAWPhkmP+epwR75Bt3yFPXr36X0vc6BMWL4IqzWHg PKXi8uKha7329IiXojg7iIfRZIlVzZd7BrYYm66NIT/hPoUtHCSHDDwv/Y0oaQnx lZnS+yCf8pn9Y5ACVanM =TNrO -----END PGP SIGNATURE----- --Sig_/_DpomABS8KWiykD5y.e09gs-- -- 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/