Commit 22985bf5 authored Nov 30, 2017 by Linus Torvalds

linux

Pull s390 fixes from Martin Schwidefsky:

 - SPDX identifiers are added to more of the s390 specific files.

 - The ELF_ET_DYN_BASE base patch from Kees is reverted, with the change
   some old 31-bit programs crash.

 - Bug fixes and cleanups.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (29 commits)
  s390/gs: add compat regset for the guarded storage broadcast control block
  s390: revert ELF_ET_DYN_BASE base changes
  s390: Remove redundant license text
  s390: crypto: Remove redundant license text
  s390: include: Remove redundant license text
  s390: kernel: Remove redundant license text
  s390: add SPDX identifiers to the remaining files
  s390: appldata: add SPDX identifiers to the remaining files
  s390: pci: add SPDX identifiers to the remaining files
  s390: mm: add SPDX identifiers to the remaining files
  s390: crypto: add SPDX identifiers to the remaining files
  s390: kernel: add SPDX identifiers to the remaining files
  s390: sthyi: add SPDX identifiers to the remaining files
  s390: drivers: Remove redundant license text
  s390: crypto: Remove redundant license text
  s390: virtio: add SPDX identifiers to the remaining files
  s390: scsi: zfcp_aux: add SPDX identifier
  s390: net: add SPDX identifiers to the remaining files
  s390: char: add SPDX identifiers to the remaining files
  s390: cio: add SPDX identifiers to the remaining files
  ...

parents a0908a1b 9d0ca444

arch/s390/Makefile

+1 −4

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		#
		# s390/Makefile
		#
		@@ -6,10 +7,6 @@
		# for "archclean" and "archdep" for cleaning up and making dependencies for
		# this architecture
		#
		# This file is subject to the terms and conditions of the GNU General Public
		# License. See the file "COPYING" in the main directory of this archive
		# for more details.
		#
		# Copyright (C) 1994 by Linus Torvalds
		#

arch/s390/appldata/appldata_base.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Base infrastructure for Linux-z/VM Monitor Stream, Stage 1.
		* Exports appldata_register_ops() and appldata_unregister_ops() for the

arch/s390/appldata/appldata_mem.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Data gathering module for Linux-VM Monitor Stream, Stage 1.
		* Collects data related to memory management.

arch/s390/appldata/appldata_net_sum.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Data gathering module for Linux-VM Monitor Stream, Stage 1.
		* Collects accumulated network statistics (Packets received/transmitted,

arch/s390/appldata/appldata_os.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Data gathering module for Linux-VM Monitor Stream, Stage 1.
		* Collects misc. OS related data (CPU utilization, running processes).

Admin message