From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186AbbFCJVL (ORCPT ); Wed, 3 Jun 2015 05:21:11 -0400 Received: from ozlabs.org ([103.22.144.67]:36722 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752304AbbFCJVE (ORCPT ); Wed, 3 Jun 2015 05:21:04 -0400 Date: Wed, 3 Jun 2015 19:20:51 +1000 From: Stephen Rothwell To: Paul Gortmaker , Russell King Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the init tree with the arm tree Message-ID: <20150603192051.42a4c95b@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_/WRdZ7iwxEaBk+7zimHwHo5F"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/WRdZ7iwxEaBk+7zimHwHo5F Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Paul, Today's linux-next merge of the init tree got a conflict in arch/arm/mach-hisi/headsmp.S between commit 02b4e2756e01 ("ARM: v7 setup function should invalidate L1 cache") from the arm tree and commit 43e92446f1d2 ("arm/mach-hisi: remove legacy __CPUINIT section that crept in") from the init tree. I fixed it up (the former removed the file) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/WRdZ7iwxEaBk+7zimHwHo5F Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVbsb9AAoJEMDTa8Ir7ZwV4ZkP/A8VzneLilFeIBoyjFqJ4Yw7 dUwJELRrus3T2ghNdkKUmvEdtOkZ5R2q3QTKHs4wRBB+dkuLAS2uspYWbvxc/Pcd 5tTIArhWmHuE1FvG8mTU9NloazIXa6BekT7LevhDfTx3N+OqSV20o0xPmeZ3fwsJ lO4bxXPaQjAf0tHhaYW8gCgq0P1D+U4Xzxs6wryCR+VoycJ4RoxKdWrWM1WuK243 QsU9bqstm9H3MWEQTQou69XmTZGeMxU/jz1Ai3egC9tby+1wPnUIUQl6YipPe/Io gf1JP6gTpuqdJPODBX3HxxyqU/ebw6pEbCAXFGdPC7eWXrLfX/857CrLiOXYlFrJ 2mM48+tn5pVsIee0fGf009rOpZJ79ptm2uNs+hEyxIu+1bT9hwWxDOnx0LwKL4d+ 4dIHc8SrrZmU6mW0SNGGLINKHdNUW7iW8D60Ap3TQJi8n9yvIsx2AOv6mTo3OYjv QlXQLlZtPf3tfrcq1APOLoPJ5zC79Hl/SqnoK4sIpQq4oAUR9VvvzK9mK4SlZxut jx7dRnIgAATiimsbbGprU6igbRRKTBJhXqT3wOh56HxMacVQ7RofP6sviLnXI9x4 NkKmshFtEdJa1WT55hIvjhPwBlLyDI1CDHfzRNbJHY96bddH4XrNYbT23/ZZSYvE oBDP9KwtOLUeFc4y7biE =B5g1 -----END PGP SIGNATURE----- --Sig_/WRdZ7iwxEaBk+7zimHwHo5F--