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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  lib/kunit/Kconfig

between commit:

  013c51446570 ("kunit: Enable PCI on UML without triggering WARN()")

from the uml tree and commit:

  5ac244b9cc8f ("kunit: Make default kunit_test timeout configurable via both a module parameter and a Kconfig option")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/kunit/Kconfig
index c8ca155521b2,c10ede4b1d22..000000000000
--- a/lib/kunit/Kconfig
+++ b/lib/kunit/Kconfig
@@@ -93,11 -93,17 +93,24 @@@ config KUNIT_AUTORUN_ENABLE
  	  In most cases this should be left as Y. Only if additional opt-in
  	  behavior is needed should this be set to N.
  
 +config KUNIT_UML_PCI
 +	bool "KUnit UML PCI Support"
 +	depends on UML
 +	select UML_PCI
 +	help
 +	  Enables the PCI subsystem on UML for use by KUnit tests.
 +
+ config KUNIT_DEFAULT_TIMEOUT
+ 	int "Default value of the timeout module parameter"
+ 	default 300
+ 	help
+ 	  Sets the default timeout, in seconds, for Kunit test cases. This value
+ 	  is further multiplied by a factor determined by the assigned speed
+ 	  setting: 1x for `DEFAULT`, 3x for `KUNIT_SPEED_SLOW`, and 12x for
+ 	  `KUNIT_SPEED_VERY_SLOW`. This allows slower tests on slower machines
+ 	  sufficient time to complete.
+ 
+ 	  If unsure, the default timeout of 300 seconds is suitable for most
+ 	  cases.
+ 
  endif # KUNIT

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