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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

Hi all,

Today's linux-next merge of the cxl tree got a conflict in:

  tools/testing/cxl/test/mem.c

between commit:

  6d9391839741 ("cxl/test: Add Get Feature support to cxl_test")

from the hmm tree and commit:

  2bb67004903c ("tools/testing/cxl: Set Shutdown State support")

from the cxl 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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/cxl/test/mem.c
index 9495dbcc03a7,0ceba8aa6eec..000000000000
--- a/tools/testing/cxl/test/mem.c
+++ b/tools/testing/cxl/test/mem.c
@@@ -177,7 -169,7 +181,8 @@@ struct cxl_mockmem_data 
  	u8 event_buf[SZ_4K];
  	u64 timestamp;
  	unsigned long sanitize_timeout;
 +	struct vendor_test_feat test_feat;
+ 	u8 shutdown_state;
  };
  
  static struct mock_event_log *event_find_log(struct device *dev, int log_type)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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