Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 26 Sep 2022 10:50:24 -0700
From:   "Paul E. McKenney" <paulmck@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jonathan Corbet <corbet@lwn.net>, Akhil Raj <lf32.dev@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the rcu tree with the jc_docs tree
Message-ID: <20220926175024.GR4196@paulmck-ThinkPad-P17-Gen-1>
Reply-To: paulmck@kernel.org
References: <20220923134834.299646cd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220923134834.299646cd@canb.auug.org.au>
Precedence: bulk

On Fri, Sep 23, 2022 at 01:48:34PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   Documentation/RCU/checklist.rst
> 
> between commit:
> 
>   712e1dea2e4f ("Delete duplicate words from kernel docs")
> 
> from the jc_docs tree and commit:
> 
>   1f0e704eea04 ("doc: Update checklist.txt")
> 
> from the rcu tree.
> 
> I fixed it up (I just used the latter since it removed the words removed
> by 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 have it down, thank you!

							Thanx, Paul