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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vBYgp041DzDq93 for ; Mon, 30 Jan 2017 13:46:46 +1100 (AEDT) Date: Mon, 30 Jan 2017 13:46:45 +1100 From: Stephen Rothwell To: "Paul E. McKenney" , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the rcu tree with the powerpc-fixes tree Message-ID: <20170130134645.5464272d@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 Paul, Today's linux-next merge of the rcu tree got a conflict in: arch/powerpc/Kconfig between commit: f2574030b0e3 ("powerpc: Revert the initial stack protector support") from the powerpc-fixes tree and commit: c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strength") from the rcu 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. -- Cheers, Stephen Rothwell diff --cc arch/powerpc/Kconfig index a0fe262408a5,9fecd004fee8..000000000000 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@@ -164,9 -164,11 +164,10 @@@ config PP select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE select HAVE_ARCH_HARDENED_USERCOPY select HAVE_KERNEL_GZIP - select HAVE_CC_STACKPROTECTOR + select ARCH_WEAK_RELEASE_ACQUIRE config GENERIC_CSUM - def_bool CPU_LITTLE_ENDIAN + def_bool n config EARLY_PRINTK bool