Commit 137177af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spdx-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx 

Pull LICENSES update from Greg KH:
 "Here are some small changes to the LICENSES files, removing the
  physical address of the FSF as the old one was incorrect and they
  finally no longer have that listed in the license files.

  These updates come directly from the FSF copies of the files, so they
  mirror what they want the files to look like"

* tag 'spdx-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
  LICENSES: Replace the obsolete address of the FSF in the GFDL-1.2
  LICENSES: Replace the obsolete address of the FSF in the GFDL-1.1
  LICENSES: Replace the obsolete address of the FSF in the LGPL-2.1
  LICENSES: Replace the obsolete address of the FSF in the LGPL-2.0
  LICENSES: Replace the obsolete address of the FSF in the GPL-2.0
  LICENSES: Replace the obsolete address of the FSF in the GPL-1.0
parents 4eee1520 06a9a440

LICENSES/deprecated/GFDL-1.1

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ License-Text: 
                   Version 1.1, March 2000



 Copyright (C) 2000  Free Software Foundation, Inc.

     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

     <https://fsf.org/>

 Everyone is permitted to copy and distribute verbatim copies

 of this license document, but changing it is not allowed.

LICENSES/deprecated/GFDL-1.2

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ License-Text: 




 Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.

     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

     <https://fsf.org/>

 Everyone is permitted to copy and distribute verbatim copies

 of this license document, but changing it is not allowed.

LICENSES/deprecated/GPL-1.0

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ License-Text: 
	     Version 1, February 1989



 Copyright (C) 1989 Free Software Foundation, Inc.

                    675 Mass Ave, Cambridge, MA 02139, USA

                    <https://fsf.org/>



 Everyone is permitted to copy and distribute verbatim copies

 of this license document, but changing it is not allowed.
@@ -227,8 +228,7 @@ the exclusion of warranty; and each file should have at least the 
    GNU General Public License for more details.



    You should have received a copy of the GNU General Public License

    along with this program; if not, write to the Free Software

    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

    along with this program; if not, see <https://www.gnu.org/licenses/>.



Also add information on how to contact you by electronic and paper mail.

LICENSES/preferred/GPL-2.0

+4 −6
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ License-Text: 
		    GNU GENERAL PUBLIC LICENSE

		       Version 2, June 1991



 Copyright (C) 1989, 1991 Free Software Foundation, Inc.

                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,

 <https://fsf.org/>

 Everyone is permitted to copy and distribute verbatim copies

 of this license document, but changing it is not allowed.
@@ -322,10 +322,8 @@ the "copyright" line and a pointer to where the full notice is found. 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    GNU General Public License for more details.



    You should have received a copy of the GNU General Public License

    along with this program; if not, write to the Free Software

    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA



    You should have received a copy of the GNU General Public License along

    with this program; if not, see <https://www.gnu.org/licenses/>.



Also add information on how to contact you by electronic and paper mail.

LICENSES/preferred/LGPL-2.0

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ GNU LIBRARY GENERAL PUBLIC LICENSE 
Version 2, June 1991



Copyright (C) 1991 Free Software Foundation, Inc.

51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA

<https://fsf.org/>



Everyone is permitted to copy and distribute verbatim copies of this

license document, but changing it is not allowed.
@@ -468,8 +468,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public 
License for more details.



You should have received a copy of the GNU Library General Public License

along with this library; if not, write to the Free Software Foundation,

Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

along with this library; if not, see <https://www.gnu.org/licenses/>.



Also add information on how to contact you by electronic and paper mail.