Merge branch 'for-6.1/sysfs-patched-object' into for-linus

author Petr Mladek <pmladek@suse.com>

Wed, 5 Oct 2022 11:00:03 +0000 (13:00 +0200)

committer Petr Mladek <pmladek@suse.com>

Wed, 5 Oct 2022 11:00:03 +0000 (13:00 +0200)
author Petr Mladek <pmladek@suse.com>
Wed, 5 Oct 2022 11:00:03 +0000 (13:00 +0200)
committer Petr Mladek <pmladek@suse.com>
Wed, 5 Oct 2022 11:00:03 +0000 (13:00 +0200)
diff --cc kernel/livepatch/core.c
Simple merge
diff --cc tools/testing/selftests/livepatch/functions.sh
Simple merge
author	Petr Mladek <pmladek@suse.com>
	Wed, 5 Oct 2022 11:00:03 +0000 (13:00 +0200)
committer	Petr Mladek <pmladek@suse.com>
	Wed, 5 Oct 2022 11:00:03 +0000 (13:00 +0200)
		1	2
kernel/livepatch/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/livepatch/functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history