From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FAB4C433E1 for ; Thu, 21 May 2020 13:41:52 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C12220825 for ; Thu, 21 May 2020 13:41:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="n7QdvfyZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C12220825 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49SW4X5YFSzDqn5 for ; Thu, 21 May 2020 23:41:48 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=srs0=cu0j=7d=paulmck-thinkpad-p72.home=paulmck@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=default header.b=n7QdvfyZ; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49SVxY6v8XzDqmC for ; Thu, 21 May 2020 23:35:45 +1000 (AEST) Received: from paulmck-ThinkPad-P72.home (50-39-105-78.bvtn.or.frontiernet.net [50.39.105.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 230D620721; Thu, 21 May 2020 13:35:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590068143; bh=vPCtfItAKZs5tbKxa7/e57pZbNrUtY2q3ZoV6TDHbK4=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=n7QdvfyZVoAbp1uztI0xitoVDwlqGOazkK7OJk+40jrBX9SB9CD31Tc/1GkzIrtF1 KI8wPzAPNWnZsweUtt9wMuMKkcWvtaszTt3Z4HucljfFJc3LC9kr3G1VVNe9YR7zX8 GdcRMWdEPN9qjvOGqlBog6znVuHi4TFNd7obmaHI= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 087C03520CB7; Thu, 21 May 2020 06:35:43 -0700 (PDT) Date: Thu, 21 May 2020 06:35:43 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Subject: Re: linux-next: manual merge of the rcu tree with the powerpc tree Message-ID: <20200521133543.GX2869@paulmck-ThinkPad-P72> References: <20200519172316.3b37cbae@canb.auug.org.au> <20200521145124.48ae408b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200521145124.48ae408b@canb.auug.org.au> User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: paulmck@kernel.org Cc: Peter Zijlstra , Linux Kernel Mailing List , Nicholas Piggin , Linux Next Mailing List , "H. Peter Anvin" , Thomas Gleixner , PowerPC , Ingo Molnar Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Thu, May 21, 2020 at 02:51:24PM +1000, Stephen Rothwell wrote: > Hi all, > > On Tue, 19 May 2020 17:23:16 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the rcu tree got a conflict in: > > > > arch/powerpc/kernel/traps.c > > > > between commit: > > > > 116ac378bb3f ("powerpc/64s: machine check interrupt update NMI accounting") > > > > from the powerpc tree and commit: > > > > 187416eeb388 ("hardirq/nmi: Allow nested nmi_enter()") > > > > from the rcu tree. > > > > I fixed it up (I used the powerpc tree version for now) 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. > > This is now a conflict between the powerpc commit and commit > > 69ea03b56ed2 ("hardirq/nmi: Allow nested nmi_enter()") > > from the tip tree. I assume that the rcu and tip trees are sharing > some patches (but not commits) :-( We are sharing commits, and in fact 187416eeb388 in the rcu tree came from the tip tree. My guess is version skew, and that I probably have another rebase coming up. Why is this happening? There are sets of conflicting commits in different efforts, and we are trying to resolve them. But we are getting feedback on some of those commits, which is probably what is causing the skew. Thanx, Paul