Re: linux-next: manual merge of the rcu tree with the jc_docs tree

[Vlastimil Babka]

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