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

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

diff --cc MAINTAINERS
index 7dff84d95e5f289fd1ca91cf31e2e5c33229ec2d,589c61412e3bb1a04698ea5cc858c4c91113074e..984de9085eb6c8f906ae320910ec3d7b0ddfd607
--- 1/MAINTAINERS
--- 2/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/

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge