linux-kernel - linux-next: manual merge of the kunit-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date: Mon, 18 Dec 2023 15:45:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Shuah Khan <skhan@...uxfoundation.org>, Brendan Higgins
 <brendanhiggins@...gle.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Michal Wajdeczko
 <michal.wajdeczko@...el.com>, Rae Moar <rmoar@...gle.com>
Subject: linux-next: manual merge of the kunit-next tree with Linus' tree

Hi all,

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

  lib/kunit/test.c

between commit:

  2e3c94aed51e ("kunit: Reset suite counter right before running tests")

from Linus' tree and commit:

  6d696c4695c5 ("kunit: add ability to run tests after boot using debugfs")

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/test.c
index 7aceb07a1af9,e803d998e855..000000000000
--- a/lib/kunit/test.c
+++ b/lib/kunit/test.c
@@@ -708,8 -675,11 +713,13 @@@ int __kunit_test_suites_init(struct kun
  		return 0;
  	}
  
 +	kunit_suite_counter = 1;
 +
+ 	/* Use mutex lock to guard against running tests concurrently. */
+ 	if (mutex_lock_interruptible(&kunit_run_lock)) {
+ 		pr_err("kunit: test interrupted\n");
+ 		return -EINTR;
+ 	}
  	static_branch_inc(&kunit_running);
  
  	for (i = 0; i < num_suites; i++) {

Content of type "application/pgp-signature" skipped