Commit 3b02a051 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh 



Resolve these conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/Makefile

Do a minor "evil merge" to move the KCSAN entry up a bit by a few lines
in the Kconfig to reduce the probability of future conflicts.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f5d2313b 8f3d9f35

.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

+4 −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>
@@ -225,6 +226,7 @@ Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com> 
Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajesh Shah <rajesh.shah@intel.com>
@@ -243,9 +245,11 @@ Santosh Shilimkar <ssantosh@kernel.org> 
Santosh Shilimkar <santosh.shilimkar@oracle.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

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