Commit 18068386 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-kunit-fixes-6.18-rc4' of... 

Merge tag 'linux_kselftest-kunit-fixes-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kunit fixes from Shuah Khan:
 "Fix log overwrite in param_tests and fixes incorrect cast of priv
  pointer in test_dev_action().

  Update email address for Rae Moar in MAINTAINERS KUnit entry"

* tag 'linux_kselftest-kunit-fixes-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  MAINTAINERS: Update KUnit email address for Rae Moar
  kunit: prevent log overwrite in param_tests
  kunit: test_dev_action: Correctly cast 'priv' pointer to long*
parents a5355e98 f3903ec7

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com> 
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rae Moar <raemoar63@gmail.com> <rmoar@google.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13612,7 +13612,7 @@ F: fs/smb/server/ 
KERNEL UNIT TESTING FRAMEWORK (KUnit)

M:	Brendan Higgins <brendan.higgins@linux.dev>

M:	David Gow <davidgow@google.com>

R:	Rae Moar <rmoar@google.com>

R:	Rae Moar <raemoar63@gmail.com>

L:	linux-kselftest@vger.kernel.org

L:	kunit-dev@googlegroups.com

S:	Maintained

lib/kunit/kunit-test.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static struct kunit_case kunit_current_test_cases[] = { 


static void test_dev_action(void *priv)

{

	*(void **)priv = (void *)1;

	*(long *)priv = 1;

}



static void kunit_device_test(struct kunit *test)

lib/kunit/test.c

+2 −1
Original line number Diff line number Diff line
@@ -745,7 +745,8 @@ int kunit_run_tests(struct kunit_suite *suite) 
					.param_index = ++test.param_index,

					.parent = &test,

				};

				kunit_init_test(&param_test, test_case->name, test_case->log);

				kunit_init_test(&param_test, test_case->name, NULL);

				param_test.log = test_case->log;

				kunit_run_case_catch_errors(suite, test_case, &param_test);



				if (param_desc[0] == '\0') {