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=-5.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,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 7CEC5C433E2 for ; Thu, 3 Sep 2020 17:02:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 571B22072A for ; Thu, 3 Sep 2020 17:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599152571; bh=S5GznL+HUXa0px3F6rIqo1KWGR2wrWuJLt1BiGDgm88=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=PZ8rt+3Al0Usax3H0BUG5Cpgl3/KqIaT1V3g2vkoCRnrq27xn1oroTniWKuOpkSU6 8A2bjejXRsytalt2oQmrRyc3n1y7WYQ5KGvaLb/H5nNlDd3pD2VS5+KINNGdlnlqX0 lxS5mOAHygVplnpvQ3XM2N8JB5WwqA8LhKJistYg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727786AbgICRCu (ORCPT ); Thu, 3 Sep 2020 13:02:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:38604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726025AbgICRCu (ORCPT ); Thu, 3 Sep 2020 13:02:50 -0400 Received: from paulmck-ThinkPad-P72.home (unknown [50.45.173.55]) (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 36C0D20758; Thu, 3 Sep 2020 17:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599152570; bh=S5GznL+HUXa0px3F6rIqo1KWGR2wrWuJLt1BiGDgm88=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=ZdUnKKoSXP+4UtxOZdbtj62/VBQszlhNCH0MfC2Zq/JoMjqRSZ4S79z5O1JJW2hPv wOP0RG9nEr7AsjeE4+dUvcd99GSO321F26NUES+27OboMW/sdid5lHjVvK8+cjoXQW 2yF6huEV98u1b0T8/Wf1wVFkRwbejy856K7QhBcw= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 172B4352300A; Thu, 3 Sep 2020 10:02:50 -0700 (PDT) Date: Thu, 3 Sep 2020 10:02:50 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Jonathan Corbet , SeongJae Park , Mauro Carvalho Chehab , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the rcu tree with the jc_docs tree Message-ID: <20200903170250.GQ29330@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20200902143101.4ea59943@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200902143101.4ea59943@canb.auug.org.au> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Sep 02, 2020 at 02:31:01PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > Documentation/memory-barriers.txt > > between commit: > > 537f3a7cf48e ("docs/memory-barriers.txt: Fix references for DMA*.txt files") > > from the jc_docs tree and commit: > > 6f6705147bab ("docs: fix references for DMA*.txt files") > > from the rcu tree. > > I fixed it up (they are preety much the same - I used the former) 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. I removed my copy, and if testing goes well, it should get to you in a few hours. Thanx, Paul