From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the akpm-current tree Date: Mon, 20 Apr 2015 15:36:05 +1000 Message-ID: <20150420153605.79daa680@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/e8xqP6.Zy5Oq2=eCifJ.Jku"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:37700 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753149AbbDTFgP (ORCPT ); Mon, 20 Apr 2015 01:36:15 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org --Sig_/e8xqP6.Zy5Oq2=eCifJ.Jku Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Andrew, Today's linux-next merge of the akpm-current tree got many conflicts in many files (presumably because most of this has been merged upstream). I just dropped the akpm-current tree for today. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/e8xqP6.Zy5Oq2=eCifJ.Jku Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVNJBKAAoJEMDTa8Ir7ZwVBFoQAIn3j+b3Sqmtnvkor1xLh2R2 /Epl1G7xpQUojJbXrDNx9kx/MxDQ3hd16DIKaGdW+qKVnh5zMYjjYtx9k3bkTMI+ C0kt4LYx+q+6NBJswcR8e8Em2UxF6y35lq7Krtv+WcSQoBplTddq3QLISCEl9UA8 jxmnb+oF/eFksxd5hw7gMjl+Rm8lUgy5XsbttFvdC/DoEKE+N4ESy1HAdpZKkvnV CAzy6IxW0fNblVUTXRapcd7d57LYpBOKzMPMB3IWM6qMUiWIPAruO1zfgGBuUdjJ TWlsThqm7YbuK3npGGA33g1ycJVhyL2/Gguj/a93lTjpS54KZTtKLRYLtFNImB6n ENfAZ0iLQOXVigx5b96lqgyl501e7lRk5nvUOUZvlLNRAjVaMnHZPmi2P/FFxpj5 Onn9cx0x3sSYgpp5wUjli4ikIeUdTW+Nrp+Bo8n1V9uZxX90aZRh3JoNRyaxTOsd L5zS/Toss5sjlIj9cUUUEUZHU6n/1C3TjnwkaB0Sne2iJBdSJ6GsXCQJGBqsw0ft O21kkNlDSULm4SPGssQqcBMDqY1/whRljh5dK7HshGzowf35eMHuPo+LPvoCDUMG 6sdnejqjkuK71ywyqznJUvtrUwH11GKdreO7rLGlMueO9EsRgP7767xnSdIF+FYV SmwzqfKJjTnuxJeyel31 =xbsF -----END PGP SIGNATURE----- --Sig_/e8xqP6.Zy5Oq2=eCifJ.Jku--