From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dan Williams <dan.j.williams@intel•com>,
Jason Gunthorpe <jgg@nvidia•com>
Cc: Dave Jiang <dave.jiang@intel•com>,
Davidlohr Bueso <dave@stgolabs•net>,
Jason Gunthorpe <jgg@ziepe•ca>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the cxl tree with the hmm tree
Date: Fri, 7 Mar 2025 19:14:48 +1100 [thread overview]
Message-ID: <20250307191448.36be9934@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2025-03-07 8:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 8:14 Stephen Rothwell [this message]
2025-03-07 12:16 ` linux-next: manual merge of the cxl tree with the hmm tree Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250307191448.36be9934@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=dave@stgolabs$(echo .)net \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox