Merge tag 'v5.2-rc4' into mauro

We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.

diff --cc Documentation/bpf/btf.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/cpu/microcode/amd.c
Simple merge

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc arch/x86/mm/tlb.c
Simple merge

diff --cc drivers/net/ethernet/faraday/ftgmac100.c
Simple merge

diff --cc drivers/vhost/vhost.c
Simple merge

diff --cc include/acpi/acpi_drivers.h
Simple merge

diff --cc include/linux/fs_context.h
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc scripts/sphinx-pre-install
index 158f522,9be208d..0b44d51
--- 1/scripts/sphinx-pre-install
--- 2/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@@ -1,17 -1,9 +1,9 @@@
  #!/usr/bin/perl
+ # SPDX-License-Identifier: GPL-2.0-or-later
  use strict;
  
 -# Copyright (c) 2017 Mauro Carvalho Chehab <mchehab@kernel.org>
 +# Copyright (c) 2017-2019 Mauro Carvalho Chehab <mchehab@kernel.org>
  #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
  
  my $conf = "Documentation/conf.py";
  my $requirement_file = "Documentation/sphinx/requirements.txt";

diff --cc security/Kconfig
Simple merge