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

[Andrew Morton]

On Wed, 15 Jul 2026 16:40:19 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/mm/hmm.rst
> 
> between commits:
> 
>   3862d3b51eb1f ("mm/hmm: add hmm_range_fault_unlocked_timeout() for mmap lock-drop support")
>   94e4afa33bac3 ("mm-hmm-add-hmm_range_fault_unlocked_timeout-for-mmap-lock-drop-support-fix")
> 
> from the mm-unstable tree and commit:
> 
>   e834ee8e571d5 ("docs/mm: Fix braces")
> 
> from the jc_docs 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.

There was no "see below".

Jon, that little patch is being a problem.  Maybe drop it and I can fix
it up and carry it in mm.git?