Merge branch 'for-5.0/upstream-fixes' into for-linus

Document change towards group maintainership of livepatching code
samples/ warning fix from Nicholas Mc Guire

diff --cc MAINTAINERS
index b1c5cf166703f018396ff49107135042d2ceee48,9787db8221dfbad0763e94125b1f01653bd0e49b..7bd760639b78b6bc06d797e302f49988eebdc036
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8832,9 -8832,8 +8832,9 @@@ F:      arch/x86/kernel/livepatch.
  F:    Documentation/livepatch/
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    samples/livepatch/
 +F:    tools/testing/selftests/livepatch/
  L:    live-patching@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
  
  LLC (802.2)
  L:    netdev@vger.kernel.org

diff --cc samples/livepatch/livepatch-shadow-fix1.c
Simple merge

diff --cc samples/livepatch/livepatch-shadow-fix2.c
Simple merge