From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751872AbdA3EAz (ORCPT ); Sun, 29 Jan 2017 23:00:55 -0500 Received: from ozlabs.org ([103.22.144.67]:35525 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281AbdA3EAi (ORCPT ); Sun, 29 Jan 2017 23:00:38 -0500 From: Michael Ellerman To: Stephen Rothwell , "Paul E. McKenney" , Benjamin Herrenschmidt , PowerPC Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the rcu tree with the powerpc-fixes tree In-Reply-To: <20170130134645.5464272d@canb.auug.org.au> References: <20170130134645.5464272d@canb.auug.org.au> User-Agent: Notmuch/0.21 (https://notmuchmail.org) Date: Mon, 30 Jan 2017 15:00:02 +1100 Message-ID: <87y3xtw62l.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > 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. Thanks. One of these years I'm totally going to sort the selects under config PPC :/ cheers