Re: linux-next: manual merge of the hmm tree with the origin tree

[Jason Gunthorpe]

On Fri, Oct 23, 2026 at 04:10:53PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the hmm tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   47193113641e5 ("coco/tsm: Update maintainership")
> 
> from the origin tree and commit:
> 
>   c5277e5b71e39 ("coco/tsm: Update maintainership")
> 
> from the hmm tree.
> 
> Alexey is in the origin version and not the hmm version for some
> reason, the changelog looks the same for both...

My bad it got changed at the last min and I didn't update this
temporary branch. I fixed it up.

Jason