Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (c6b3e969) · Commits · 戴 / test

Pull s390 fixes from Martin Schwidefsky: - three more patches in regard to the SPDX license tags. The missing tags for the files in arch/s390/kvm will be merged via the KVM tree. With that all s390 related files should have their SPDX tags. - a patch to get rid of 'struct timespec' in the DASD driver. - bug fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: fix compat system call table s390/mm: fix off-by-one bug in 5-level page table handling s390: Remove redudant license text s390: add a few more SPDX identifiers s390/dasd: prevent prefix I/O error s390: always save and restore all registers on context switch s390/dasd: remove 'struct timespec' usage s390/qdio: restrict target-full handling to IQDIO s390/qdio: consider ERROR buffers for inbound-full condition s390/virtio: add BSD license to virtio-ccw

arch/s390/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		obj-y += kernel/
		obj-y += mm/
		obj-$(CONFIG_KVM) += kvm/

arch/s390/appldata/Makefile

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		#
		# Makefile for the Linux - z/VM Monitor Stream.
		#

arch/s390/boot/compressed/vmlinux.scr

+1 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		SECTIONS
		{
		.rodata.compressed : {

arch/s390/crypto/sha1_s390.c

+1 −6

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0+
		/*
		* Cryptographic API.
		*
		@@ -16,12 +17,6 @@
		* Copyright (c) Alan Smithee.
		* Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
		* Copyright (c) Jean-Francois Dive <jef@linuxbe.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.
		*
		*/
		#include <crypto/internal/hash.h>
		#include <linux/init.h>

arch/s390/hypfs/Makefile

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		#
		# Makefile for the linux hypfs filesystem routines.
		#

Admin message