Commit d3bd37f5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge v5.6-rc5 into drm-next 



Requested my mripard for some misc patches that need this as a base.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 60347451 2c523b34

COPYING

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see: 
	Documentation/process/license-rules.rst



for more details.



All contributions to the Linux Kernel are subject to this COPYING file.

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem 
S: Orlando, Florida

S: USA



N: Paul Burton

E: paulburton@kernel.org

W: https://pburton.com

D: MIPS maintainer 2018-2020



N: Lennert Buytenhek

E: kernel@wantstofly.org

D: Original (2.4) rewrite of the ethernet bridging code

Documentation/admin-guide/bootconfig.rst

+31 −3
Original line number Diff line number Diff line
@@ -62,6 +62,30 @@ Or more shorter, written as following:: 
In both styles, same key words are automatically merged when parsing it

at boot time. So you can append similar trees or key-values.



Same-key Values

---------------



It is prohibited that two or more values or arrays share a same-key.

For example,::



 foo = bar, baz

 foo = qux  # !ERROR! we can not re-define same key



If you want to append the value to existing key as an array member,

you can use ``+=`` operator. For example::



 foo = bar, baz

 foo += qux



In this case, the key ``foo`` has ``bar``, ``baz`` and ``qux``.



However, a sub-key and a value can not co-exist under a parent key.

For example, following config is NOT allowed.::



 foo = value1

 foo.bar = value2 # !ERROR! subkey "bar" and value "value1" can NOT co-exist





Comments

--------
@@ -102,9 +126,13 @@ Boot Kernel With a Boot Config 
==============================



Since the boot configuration file is loaded with initrd, it will be added

to the end of the initrd (initramfs) image file. The Linux kernel decodes

the last part of the initrd image in memory to get the boot configuration

data.

to the end of the initrd (initramfs) image file with size, checksum and

12-byte magic word as below.



[initrd][bootconfig][size(u32)][checksum(u32)][#BOOTCONFIG\n]



The Linux kernel decodes the last part of the initrd image in memory to

get the boot configuration data.

Because of this "piggyback" method, there is no need to change or

update the boot loader and the kernel image itself.

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ 
			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpi_no_watchdog	[HW,ACPI,WDT]

			Ignore the ACPI-based watchdog interface (WDAT) and let

			a native driver control the watchdog device instead.



	acpi_rsdp=	[ACPI,EFI,KEXEC]

			Pass the RSDP address to the kernel, mostly used

			on machines running EFI runtime service to boot the

Documentation/arm64/memory.rst

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ this logic. 


As a single binary will need to support both 48-bit and 52-bit VA

spaces, the VMEMMAP must be sized large enough for 52-bit VAs and

also must be sized large enought to accommodate a fixed PAGE_OFFSET.

also must be sized large enough to accommodate a fixed PAGE_OFFSET.



Most code in the kernel should not need to consider the VA_BITS, for

code that does need to know the VA size the variables are