From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jun 2022 15:55:01 +0000 (-0700)
Subject: Merge tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~7365
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c9e960c636306f632ccae623bf94b2b53d35cbd;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'livepatching-for-5.19' of git://git./linux/kernel/git/livepatching/livepatching

Pull livepatching cleanup from Petr Mladek:

 - Remove duplicated livepatch code [Christophe]

* tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  livepatch: Remove klp_arch_set_pc() and asm/livepatch.h
---

7c9e960c636306f632ccae623bf94b2b53d35cbd
diff --cc MAINTAINERS
index 7dff84d95e5f,589c61412e3b..984de9085eb6
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11434,11 -11338,8 +11434,9 @@@ T:	git git://git.kernel.org/pub/scm/lin
  F:	Documentation/ABI/testing/sysfs-kernel-livepatch
  F:	Documentation/livepatch/
  F:	arch/powerpc/include/asm/livepatch.h
- F:	arch/s390/include/asm/livepatch.h
- F:	arch/x86/include/asm/livepatch.h
  F:	include/linux/livepatch.h
  F:	kernel/livepatch/
 +F:	kernel/module/livepatch.c
  F:	lib/livepatch/
  F:	samples/livepatch/
  F:	tools/testing/selftests/livepatch/