linux-next: manual merge of the kunit-next tree with the spi tree

Hi all,

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

  tools/testing/kunit/configs/all_tests.config

between commit:

  9b81a87c5244b ("spi: Add KUnit coverage for DMA mapping error paths")

from the spi tree and commit:

  34b5c0132952c ("kunit: configs: enable GPIO kunit test cases in all_tests.config")

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 tools/testing/kunit/configs/all_tests.config
index 7bdcbdec2cab0,6825c2e855a55..0000000000000
--- a/tools/testing/kunit/configs/all_tests.config
+++ b/tools/testing/kunit/configs/all_tests.config
@@@ -21,7 -21,7 +21,8 @@@ CONFIG_VFAT_FS=
  CONFIG_PCI=y
  CONFIG_USB4=y
  CONFIG_I2C=y
 +CONFIG_SPI=y
+ CONFIG_GPIOLIB=y
  
  CONFIG_NET=y
  CONFIG_MCTP=y

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmqDM4sACgkQJNaLcl1U
h9AKJAf/QG7U/qHHCBdN9ldcKOPQLA9JEjHnilTH+Oq+Z4gyVToAqkxJLt+WBqFA
bZy+4qK/F/JRKuH3/59haxU3UjL+PL4D+ESfSvL+KGM2109DqzgfYgEKNxFhQ5Sj
Zmk76FFmf9xU8iNnfPEJ6fsyA8l2EP0tP7gswK6YPTtwV9gPVDuKGQzK0DjJVcIE
JoHX9zSNKUDRU8JZcN6CwUy2QXGbZ1X6SdMzBPm/c4sXFIiJu4Bm2VCPeZxJ4K2k
5jxZthWFgLziTsZFJ+s3AUQzZ/TKPUEIOb2isewCWU24G6gd3ZgwnRakPw6Y60bX
2jIXlPrllsS+hd269EUvrZaa8fL5cw==
=8ioT
-----END PGP SIGNATURE-----