Subject: linux-next: manual merge of the kunit-next tree with the drm-xe tree

From: Mark Brown <[email-masked]>
Date: Thu, 18 Sep 2025 15:39:32 +0100

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);