Commit 39ffd86d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/boot, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 18ea89ea 8ed12ab1

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2071,6 +2071,10 @@ S: 660 Harvard Ave. #7 
S: Santa Clara, CA 95051

S: USA



N: Joonsoo Kim

E: iamjoonsoo.kim@lge.com

D: Slab allocators



N: Kukjin Kim

E: kgene@kernel.org

D: Samsung S3C, S5P and Exynos ARM architectures

Documentation/ABI/stable/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Description: 


What:		/sys/block/<disk>/diskseq

Date:		February 2021

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:

		The /sys/block/<disk>/diskseq files reports the disk

		sequence number, which is a monotonically increasing

Documentation/ABI/testing/sysfs-kernel-reboot

+5 −5
Original line number Diff line number Diff line 
What:		/sys/kernel/reboot

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Interface to set the kernel reboot behavior, similarly to

		what can be done via the reboot= cmdline option.

		(see Documentation/admin-guide/kernel-parameters.txt)
@@ -9,25 +9,25 @@ Description: Interface to set the kernel reboot behavior, similarly to 
What:		/sys/kernel/reboot/mode

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Reboot mode. Valid values are: cold warm hard soft gpio



What:		/sys/kernel/reboot/type

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Reboot type. Valid values are: bios acpi kbd triple efi pci



What:		/sys/kernel/reboot/cpu

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	CPU number to use to reboot.



What:		/sys/kernel/reboot/force

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Don't wait for any other CPUs on reboot and

		avoid anything that could hang.

Documentation/admin-guide/xfs.rst

+8 −21
Original line number Diff line number Diff line
@@ -562,19 +562,6 @@ The interesting knobs for XFS workqueues are as follows: 
Zoned Filesystems

=================



For zoned file systems, the following attribute is exposed in:



  /sys/fs/xfs/<dev>/zoned/



  max_open_zones		(Min:  1  Default:  Varies  Max:  UINTMAX)

	This read-only attribute exposes the maximum number of open zones

	available for data placement. The value is determined at mount time and

	is limited by the capabilities of the backing zoned device, file system

	size and the max_open_zones mount option.



Zoned Filesystems

=================



For zoned file systems, the following attributes are exposed in:



  /sys/fs/xfs/<dev>/zoned/

Documentation/arch/openrisc/openrisc_port.rst

+6 −6
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ target architecture, specifically, is the 32-bit OpenRISC 1000 family (or1k). 


For information about OpenRISC processors and ongoing development:



	=======		=============================

	=======		==============================

	website		https://openrisc.io

	email		openrisc@lists.librecores.org

	=======		=============================

	email		linux-openrisc@vger.kernel.org

	=======		==============================



---------------------------------------------------------------------
@@ -27,11 +27,11 @@ Toolchain binaries can be obtained from openrisc.io or our github releases page. 
Instructions for building the different toolchains can be found on openrisc.io

or Stafford's toolchain build and release scripts.



	==========	=================================================

	binaries	https://github.com/openrisc/or1k-gcc/releases

	==========	==========================================================

	binaries	https://github.com/stffrdhrn/or1k-toolchain-build/releases

	toolchains	https://openrisc.io/software

	building	https://github.com/stffrdhrn/or1k-toolchain-build

	==========	=================================================

	==========	==========================================================



2) Building