From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbbE1Gi7 (ORCPT ); Thu, 28 May 2015 02:38:59 -0400 Received: from ozlabs.org ([103.22.144.67]:59801 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbbE1Giy (ORCPT ); Thu, 28 May 2015 02:38:54 -0400 Date: Thu, 28 May 2015 16:38:46 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, chris hyser , Bartosz Golaszewski Subject: linux-next: manual merge of the tip tree with the sparc tree Message-ID: <20150528163846.05f47bd6@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_/8UbiCNBoq+7obPbjxZs63p2"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/8UbiCNBoq+7obPbjxZs63p2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in arch/sparc/include/asm/topology_64.h between commit acc455cffa75 ("sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly") from the sparc tree and commit 06931e622468 ("sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask()") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/sparc/include/asm/topology_64.h index d1761df5cca6,9a928fcb7a9b..000000000000 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@@ -40,8 -40,8 +40,8 @@@ static inline int pcibus_to_node(struc #ifdef CONFIG_SMP #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) #define topology_core_id(cpu) (cpu_data(cpu).core_id) -#define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) +#define topology_core_cpumask(cpu) (&cpu_core_sib_map[cpu]) - #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) + #define topology_sibling_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) #endif /* CONFIG_SMP */ =20 extern cpumask_t cpu_core_map[NR_CPUS]; --Sig_/8UbiCNBoq+7obPbjxZs63p2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVZrf7AAoJEMDTa8Ir7ZwVOvcQAI5yoe9KTkfdoYKABVdNwgnO VxGGC0rfObpML/d0PHqdMoz5K5+3UcWT94v0rrdXEfBzHMkPOSTC1c7LmlP9yPrd ecOuVZSwkCfX/tCiDLXdqaBOxUYJPS0MO24K862tDQRJEs/ZY2VH+91nDFzCYVsG e4zubOAvhHVblUwEOJVU9aHiGFNZ8RuOMjarsOgSDLIbDNuxCChiWxXdybXoQaiq X8Hq1CvOMDXIoJpTOAn07CjaX0Hg2vsu/8hPTwgg9c6YS9Ge/+PVUM0VMc0pNu4C h7gWvD+L4zrY7RoNZEun4WROBcyMPKwVqm5o47L0qx48VUIH/kB/PXlX5HyiDUQp Yi5vji8enmx2K7jTP9oaThREzFk/lZxt7XFQROXyIVWPoOLy3hq9PsJU6jiroKhm vlVxBsC0wyXDLRbH+9ZmL47xfT140yKuWc3NBW9HLn0Zz9GCLb0dQlAfZIrK5F/S WsDgXw+ovd7q7KBRCzxUFGRp4wDomIzriACd3lEbmhnsLN/g0w6AtaDzgfGnuyLo C2jMtVnr8fJ5fdlDRkCqdJXuntdCodYF/u9PpNmwtXiiZSHMMYN7mSzXcVXOQNaO u/PDHec8b67Bq2DuDftpjb8v11tCGLK3F8/dR8fPnU/39cZxxpvCK9JHa6mbvyy6 fl0pfAFEBjovQx6FbWfm =XqL5 -----END PGP SIGNATURE----- --Sig_/8UbiCNBoq+7obPbjxZs63p2--