Skip to content

Commit 074cc53

Browse files
committed
Kernel 5.6.0-rc4
1 parent 6be1f4b commit 074cc53

File tree

215 files changed

+2549
-1328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+2549
-1328
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ modules.order
100100
/include/ksym/
101101
/arch/*/include/generated/
102102

103+
# Generated lkdtm tests
104+
/tools/testing/selftests/lkdtm/*.sh
105+
!/tools/testing/selftests/lkdtm/run.sh
106+
103107
# stgit generated dirs
104108
patches-*
105109

CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem
567567
S: Orlando, Florida
568568
S: USA
569569

570+
N: Paul Burton
571+
572+
W: https://pburton.com
573+
D: MIPS maintainer 2018-2020
574+
570575
N: Lennert Buytenhek
571576
572577
D: Original (2.4) rewrite of the ethernet bridging code

Documentation/admin-guide/bootconfig.rst

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,30 @@ Or more shorter, written as following::
6262
In both styles, same key words are automatically merged when parsing it
6363
at boot time. So you can append similar trees or key-values.
6464

65+
Same-key Values
66+
---------------
67+
68+
It is prohibited that two or more values or arrays share a same-key.
69+
For example,::
70+
71+
foo = bar, baz
72+
foo = qux # !ERROR! we can not re-define same key
73+
74+
If you want to append the value to existing key as an array member,
75+
you can use ``+=`` operator. For example::
76+
77+
foo = bar, baz
78+
foo += qux
79+
80+
In this case, the key ``foo`` has ``bar``, ``baz`` and ``qux``.
81+
82+
However, a sub-key and a value can not co-exist under a parent key.
83+
For example, following config is NOT allowed.::
84+
85+
foo = value1
86+
foo.bar = value2 # !ERROR! subkey "bar" and value "value1" can NOT co-exist
87+
88+
6589
Comments
6690
--------
6791

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

104128
Since the boot configuration file is loaded with initrd, it will be added
105-
to the end of the initrd (initramfs) image file. The Linux kernel decodes
106-
the last part of the initrd image in memory to get the boot configuration
107-
data.
129+
to the end of the initrd (initramfs) image file with size, checksum and
130+
12-byte magic word as below.
131+
132+
[initrd][bootconfig][size(u32)][checksum(u32)][#BOOTCONFIG\n]
133+
134+
The Linux kernel decodes the last part of the initrd image in memory to
135+
get the boot configuration data.
108136
Because of this "piggyback" method, there is no need to change or
109137
update the boot loader and the kernel image itself.
110138

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@
136136
dynamic table installation which will install SSDT
137137
tables to /sys/firmware/acpi/tables/dynamic.
138138

139+
acpi_no_watchdog [HW,ACPI,WDT]
140+
Ignore the ACPI-based watchdog interface (WDAT) and let
141+
a native driver control the watchdog device instead.
142+
139143
acpi_rsdp= [ACPI,EFI,KEXEC]
140144
Pass the RSDP address to the kernel, mostly used
141145
on machines running EFI runtime service to boot the

Documentation/dev-tools/kunit/usage.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@ options to your ``.config``:
551551
Once the kernel is built and installed, a simple
552552

553553
.. code-block:: bash
554+
554555
modprobe example-test
555556
556557
...will run the tests.

Documentation/kbuild/makefiles.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ is not sufficient this sometimes needs to be explicit.
765765
Example::
766766

767767
#arch/x86/boot/Makefile
768-
subdir- := compressed/
768+
subdir- := compressed
769769

770770
The above assignment instructs kbuild to descend down in the
771771
directory compressed/ when "make clean" is executed.
@@ -1379,9 +1379,6 @@ See subsequent chapter for the syntax of the Kbuild file.
13791379
in arch/$(ARCH)/include/(uapi/)/asm, Kbuild will automatically generate
13801380
a wrapper of the asm-generic one.
13811381

1382-
The convention is to list one subdir per line and
1383-
preferably in alphabetic order.
1384-
13851382
8 Kbuild Variables
13861383
==================
13871384

Documentation/networking/phy.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,9 @@ phy_register_fixup_for_id()::
487487
The stubs set one of the two matching criteria, and set the other one to
488488
match anything.
489489

490-
When phy_register_fixup() or \*_for_uid()/\*_for_id() is called at module,
491-
unregister fixup and free allocate memory are required.
490+
When phy_register_fixup() or \*_for_uid()/\*_for_id() is called at module load
491+
time, the module needs to unregister the fixup and free allocated memory when
492+
it's unloaded.
492493

493494
Call one of following function before unloading module::
494495

Documentation/power/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Power Management
1313
drivers-testing
1414
energy-model
1515
freezing-of-tasks
16-
interface
1716
opp
1817
pci
1918
pm_qos_interface

Documentation/sphinx/parallel-wrapper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then
3030
parallel="-j$parallel"
3131
fi
3232

33-
exec "$sphinx" "$parallel" "$@"
33+
exec "$sphinx" $parallel "$@"

Documentation/virt/kvm/api.rst

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4611,35 +4611,38 @@ unpins the VPA pages and releases all the device pages that are used to
46114611
track the secure pages by hypervisor.
46124612

46134613
4.122 KVM_S390_NORMAL_RESET
4614+
---------------------------
46144615

4615-
Capability: KVM_CAP_S390_VCPU_RESETS
4616-
Architectures: s390
4617-
Type: vcpu ioctl
4618-
Parameters: none
4619-
Returns: 0
4616+
:Capability: KVM_CAP_S390_VCPU_RESETS
4617+
:Architectures: s390
4618+
:Type: vcpu ioctl
4619+
:Parameters: none
4620+
:Returns: 0
46204621

46214622
This ioctl resets VCPU registers and control structures according to
46224623
the cpu reset definition in the POP (Principles Of Operation).
46234624

46244625
4.123 KVM_S390_INITIAL_RESET
4626+
----------------------------
46254627

4626-
Capability: none
4627-
Architectures: s390
4628-
Type: vcpu ioctl
4629-
Parameters: none
4630-
Returns: 0
4628+
:Capability: none
4629+
:Architectures: s390
4630+
:Type: vcpu ioctl
4631+
:Parameters: none
4632+
:Returns: 0
46314633

46324634
This ioctl resets VCPU registers and control structures according to
46334635
the initial cpu reset definition in the POP. However, the cpu is not
46344636
put into ESA mode. This reset is a superset of the normal reset.
46354637

46364638
4.124 KVM_S390_CLEAR_RESET
4639+
--------------------------
46374640

4638-
Capability: KVM_CAP_S390_VCPU_RESETS
4639-
Architectures: s390
4640-
Type: vcpu ioctl
4641-
Parameters: none
4642-
Returns: 0
4641+
:Capability: KVM_CAP_S390_VCPU_RESETS
4642+
:Architectures: s390
4643+
:Type: vcpu ioctl
4644+
:Parameters: none
4645+
:Returns: 0
46434646

46444647
This ioctl resets VCPU registers and control structures according to
46454648
the clear cpu reset definition in the POP. However, the cpu is not put

0 commit comments

Comments
 (0)