Commit 3bda0386 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.7-2' of... 

Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

KVM: s390: Fix for 5.7 and maintainer update

- Silence false positive lockdep warning
- add Claudio as reviewer
parents 7f4b5cde 2a173ec9

.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

#

# NOTE! Don't add files that are generated in specific

# subdirectories here. Add them in the ".gitignore" file

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com> 
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
@@ -248,6 +249,7 @@ Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi> 
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>

Sebastian Reichel <sre@kernel.org> <sre@debian.org>

Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>

Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Documentation/.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

output

*.pyc

Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled

0 → 100644
+9 −0
Original line number Diff line number Diff line 
This ABI is renamed and moved to a new location /sys/kernel/fadump/enabled.



What:		/sys/kernel/fadump_enabled

Date:		Feb 2012

Contact:	linuxppc-dev@lists.ozlabs.org

Description:	read only

		Primarily used to identify whether the FADump is enabled in

		the kernel or not.

User:		Kdump service

Documentation/ABI/obsolete/sysfs-kernel-fadump_registered

0 → 100644
+10 −0
Original line number Diff line number Diff line 
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬



What:		/sys/kernel/fadump_registered

Date:		Feb 2012

Contact:	linuxppc-dev@lists.ozlabs.org

Description:	read/write

		Helps to control the dump collect feature from userspace.

		Setting 1 to this file enables the system to collect the

		dump and 0 to disable it.

User:		Kdump service

CRA Git | Maintained and supported by SUSTech CRA and CCSE