From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934193AbaE2JEz (ORCPT ); Thu, 29 May 2014 05:04:55 -0400 Received: from ozlabs.org ([103.22.144.67]:40983 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933844AbaE2JEx (ORCPT ); Thu, 29 May 2014 05:04:53 -0400 Date: Thu, 29 May 2014 19:04:47 +1000 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mel Gorman , Preeti U Murthy Subject: linux-next: manual merge of the akpm-current tree with the tree Message-ID: <20140529190447.42547aba@canb.auug.org.au> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; i486-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/8/VoqhjQUtJT/8mbVfBtJ6h"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/8/VoqhjQUtJT/8mbVfBtJ6h 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 a conflict in arch/powerpc/include/asm/topology.h between commit 4750afa2c568 ("powerpc: Fix comment around arch specific definition of RECLAIM_DISTANCE") from the powerpc tree and commit ba5b7fb4aebd ("mm: disable zone_reclaim_mode by default") from the akpm-current tree. I fixed it up (I use th akpm-current tree version) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/8/VoqhjQUtJT/8mbVfBtJ6h Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJThvgzAAoJEMDTa8Ir7ZwV8hsP/jAl5XqweaX95XRd0MUMEa4L Z/Yyw2lkN7Igbpi6GbRkCAMRmMCxObOXNIY3C1qJva7PMxR9ENliKOpNZBPkEHtC 9a4ucBCSqovx77zqwucqsFIEQuARuTpV+bcFxYiFyJ2VWDXOxW4B5D/jYqe53NLr PlvJcDKbNXp7VnZqJiZuMFkCBcKmxkdgueVeJRfiebUtj8Ju6CRfFW0TAInrtJxB H7AjCInnUPfQ8Eu++ajqY1qgZk2eLIpPlNAe2gbmhggLddMg3mZTgJoCfYcKNS4t jnj78zXzFLuXLcRUwrGeL3exJbFD6dgiT2jaMJ7yzaW/bYfpKUCWR3UywnJ5gy9M nwLCWykp52wEES5Xxrgvw9E081EHjrzkt/tA7nWbFJ0ZLYAAQlSYJe73PPNE8aIZ AyJ11nBhxQn31crf7L7aoECrNC1YXzM82fwnmNpZdHChU/FtAEP2JILWwcRW0IdB hA+omRMXiiclwOBzpUR8jfHCs8vv6GYzDaXl3TqdQoZf4TbSBXqRRBoHA9u8DhzJ EoLiccLrRKGGZe+Z3Vk6fr+AdWCEBRE33ZUyQBACdXa24Vaq8B5nM7IUt6QfvweQ rcIwYw//QI5oCBN7+O7PLxgk+iXMttEGoxNvnlOp0epTtrqbsoTR/7wqoE9+HMRl E4PyOF7rpej0UYEGg928 =UL5c -----END PGP SIGNATURE----- --Sig_/8/VoqhjQUtJT/8mbVfBtJ6h--