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

[Jason Gunthorpe]

On Fri, Mar 07, 2025 at 07:14:48PM +1100, Stephen Rothwell wrote:
> 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.

Thanks, it looks right

Jason