From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 14 Jun 2019 20:18:53 +0000 (-0600)
Subject: Merge tag 'v5.2-rc4' into mauro
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8afecfb0ec961e37e61b2d19c4fa71617a9482de;p=linux.git

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.
---

8afecfb0ec961e37e61b2d19c4fa71617a9482de
diff --cc scripts/sphinx-pre-install
index 158f522f12edb,9be208db88d3a..0b44d51c4991b
--- a/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";