From: Mark Brown <broonie@kernel•org>
To: Shuah Khan <skhan@linuxfoundation•org>
Cc: David Gow <davidgow@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Marie Zhussupova <marievic@google•com>,
Michal Wajdeczko <michal.wajdeczko@intel•com>
Subject: linux-next: manual merge of the kunit-next tree with the drm-xe tree
Date: Thu, 18 Sep 2025 15:39:32 +0100 [thread overview]
Message-ID: <aMwZpOFYiX1YaSB9@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2365 bytes --]
Hi all,
Today's linux-next merge of the kunit-next tree got a conflict in:
drivers/gpu/drm/xe/tests/xe_pci.c
between commit:
5bb5258e357eb ("drm/xe/tests: Add pre-GMDID IP descriptors to param generators")
from the drm-xe tree and commit:
b9a214b5f6aa5 ("kunit: Pass parameterized test context to generate_params()")
from the kunit-next 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.
diff --cc drivers/gpu/drm/xe/tests/xe_pci.c
index aa29ac759d5db,f707e0a542959..0000000000000
--- a/drivers/gpu/drm/xe/tests/xe_pci.c
+++ b/drivers/gpu/drm/xe/tests/xe_pci.c
@@@ -251,16 -44,9 +251,16 @@@ KUNIT_ARRAY_PARAM(pci_id, pciidlist, xe
*
* Return: pointer to the next parameter or NULL if no more parameters
*/
- const void *xe_pci_graphics_ip_gen_param(const void *prev, char *desc)
+ const void *xe_pci_graphics_ip_gen_param(struct kunit *test, const void *prev, char *desc)
{
- const void *next = pre_gmdid_graphics_ip_gen_params(prev, desc);
++ const void *next = pre_gmdid_graphics_ip_gen_params(test, prev, desc);
+
+ if (next)
+ return next;
+ if (is_insidevar(prev, pre_gmdid_graphics_ips))
+ prev = NULL;
+
- return graphics_ip_gen_params(prev, desc);
+ return graphics_ip_gen_params(test, prev, desc);
}
EXPORT_SYMBOL_IF_KUNIT(xe_pci_graphics_ip_gen_param);
@@@ -275,16 -61,9 +275,16 @@@
*
* Return: pointer to the next parameter or NULL if no more parameters
*/
- const void *xe_pci_media_ip_gen_param(const void *prev, char *desc)
+ const void *xe_pci_media_ip_gen_param(struct kunit *test, const void *prev, char *desc)
{
- const void *next = pre_gmdid_media_ip_gen_params(prev, desc);
++ const void *next = pre_gmdid_media_ip_gen_params(test, prev, desc);
+
+ if (next)
+ return next;
+ if (is_insidevar(prev, pre_gmdid_media_ips))
+ prev = NULL;
+
- return media_ip_gen_params(prev, desc);
+ return media_ip_gen_params(test, prev, desc);
}
EXPORT_SYMBOL_IF_KUNIT(xe_pci_media_ip_gen_param);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-18 14:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-18 14:39 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-08 7:29 linux-next: manual merge of the kunit-next tree with the drm-xe tree Stephen Rothwell
2025-09-08 13:26 ` Lucas De Marchi
2025-09-08 22:33 ` Stephen Rothwell
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=aMwZpOFYiX1YaSB9@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=davidgow@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marievic@google$(echo .)com \
--cc=michal.wajdeczko@intel$(echo .)com \
--cc=skhan@linuxfoundation$(echo .)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