From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rt7KJ0BVRzDqDX for ; Mon, 18 Jul 2016 13:03:16 +1000 (AEST) Date: Mon, 18 Jul 2016 13:03:15 +1000 From: Stephen Rothwell To: Kees Cook , Michael Ellerman , Benjamin Herrenschmidt , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christophe Leroy Subject: linux-next: manual merge of the kspp tree with the powerpc tree Message-ID: <20160718130315.314f8a77@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi Kees, Today's linux-next merge of the kspp tree got a conflict in: arch/powerpc/Kconfig between commit: c223c90386bc ("powerpc32: provide VIRT_CPU_ACCOUNTING") from the powerpc tree and commit: 006d998dda94 ("powerpc/uaccess: Enable hardened usercopy") from the kspp tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. Michael: time to sort these selects? -- Cheers, Stephen Rothwell diff --cc arch/powerpc/Kconfig index fcfe5332416f,b7a18b2604be..000000000000 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@@ -165,7 -164,7 +165,8 @@@ config PP select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS + select HAVE_VIRT_CPU_ACCOUNTING + select HAVE_ARCH_HARDENED_USERCOPY config GENERIC_CSUM def_bool CPU_LITTLE_ENDIAN