Received-SPF: pass (google.com: domain of linux-kernel+bounces-14197-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <0d98192e-f9ac-cc49-fd7e-3551c7af1881@suse.cz>
Date: Tue, 2 Jan 2024 10:39:42 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: linux-next: manual merge of the rcu tree with the jc_docs tree
Content-Language: en-US
To: Stephen Rothwell <sfr@canb.auug.org.au>,
 "Paul E. McKenney" <paulmck@kernel.org>, Jonathan Corbet <corbet@lwn.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20231218142537.3b74c770@canb.auug.org.au>
From: Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <20231218142537.3b74c770@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 12/18/23 04:25, Stephen Rothwell wrote:
> Hi all,

Hi,


> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   Documentation/admin-guide/kernel-parameters.txt
> 
> between commit:
> 
>   a3a27827452f ("Documentation, mm/unaccepted: document accept_memory kernel parameter")
> 
> from the jc_docs tree and commit:
> 
>   801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters")

in light of that commit, the accept_memory should now have:

 +	accept_memory=  [MM,EARLY]

Jon, can you update it still, or want a followup patch, or perhaps will
suggest Linus to do that as part of the merge?

> 
> 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.
>