Skip to content

Commit 6a77de2

Browse files
committed
Merge tag 'v5.5-rc6' into devel
Linux 5.5-rc6
2 parents 59c3246 + b3a987b commit 6a77de2

File tree

1,381 files changed

+13065
-6925
lines changed

Some content is hidden

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

1,381 files changed

+13065
-6925
lines changed

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ Linus Lüssing <[email protected]> <[email protected]>
152152
153153
154154
155+
155156
156157
157158
@@ -265,6 +266,7 @@ Vinod Koul <[email protected]> <[email protected]>
265266
266267
267268
269+
268270
269271
270272
@@ -276,3 +278,5 @@ Gustavo Padovan <[email protected]>
276278
Gustavo Padovan <[email protected]>
277279
278280
281+
282+

Documentation/ABI/testing/sysfs-platform-mellanox-bootctl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/bus/platform/devices/MLNXBF04:00/driver/lifecycle_state
1+
What: /sys/bus/platform/devices/MLNXBF04:00/lifecycle_state
22
Date: Oct 2019
33
KernelVersion: 5.5
44
Contact: "Liming Sun <[email protected]>"
@@ -10,7 +10,7 @@ Description:
1010
GA Non-Secured - Non-Secure chip and not able to change state
1111
RMA - Return Merchandise Authorization
1212

13-
What: /sys/bus/platform/devices/MLNXBF04:00/driver/post_reset_wdog
13+
What: /sys/bus/platform/devices/MLNXBF04:00/post_reset_wdog
1414
Date: Oct 2019
1515
KernelVersion: 5.5
1616
Contact: "Liming Sun <[email protected]>"
@@ -19,7 +19,7 @@ Description:
1919
to reboot the chip and recover it to the old state if the new
2020
boot partition fails.
2121

22-
What: /sys/bus/platform/devices/MLNXBF04:00/driver/reset_action
22+
What: /sys/bus/platform/devices/MLNXBF04:00/reset_action
2323
Date: Oct 2019
2424
KernelVersion: 5.5
2525
Contact: "Liming Sun <[email protected]>"
@@ -30,7 +30,7 @@ Description:
3030
emmc - boot from the onchip eMMC
3131
emmc_legacy - boot from the onchip eMMC in legacy (slow) mode
3232

33-
What: /sys/bus/platform/devices/MLNXBF04:00/driver/second_reset_action
33+
What: /sys/bus/platform/devices/MLNXBF04:00/second_reset_action
3434
Date: Oct 2019
3535
KernelVersion: 5.5
3636
Contact: "Liming Sun <[email protected]>"
@@ -44,7 +44,7 @@ Description:
4444
swap_emmc - swap the primary / secondary boot partition
4545
none - cancel the action
4646

47-
What: /sys/bus/platform/devices/MLNXBF04:00/driver/secure_boot_fuse_state
47+
What: /sys/bus/platform/devices/MLNXBF04:00/secure_boot_fuse_state
4848
Date: Oct 2019
4949
KernelVersion: 5.5
5050
Contact: "Liming Sun <[email protected]>"

Documentation/admin-guide/device-mapper/dm-integrity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ journal_crypt:algorithm(:key) (the key is optional)
144144
Encrypt the journal using given algorithm to make sure that the
145145
attacker can't read the journal. You can use a block cipher here
146146
(such as "cbc(aes)") or a stream cipher (for example "chacha20",
147-
"salsa20", "ctr(aes)" or "ecb(arc4)").
147+
"salsa20" or "ctr(aes)").
148148

149149
The journal contains history of last writes to the block device,
150150
an attacker reading the journal could see the last sector nubmers

Documentation/admin-guide/device-mapper/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Device Mapper
88
cache-policies
99
cache
1010
delay
11+
dm-clone
1112
dm-crypt
1213
dm-dust
1314
dm-flakey

Documentation/admin-guide/ext4.rst

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,17 @@ When mounting an ext4 filesystem, the following option are accepted:
181181
system after its metadata has been committed to the journal.
182182

183183
commit=nrsec (*)
184-
Ext4 can be told to sync all its data and metadata every 'nrsec'
185-
seconds. The default value is 5 seconds. This means that if you lose
186-
your power, you will lose as much as the latest 5 seconds of work (your
187-
filesystem will not be damaged though, thanks to the journaling). This
188-
default value (or any low value) will hurt performance, but it's good
189-
for data-safety. Setting it to 0 will have the same effect as leaving
190-
it at the default (5 seconds). Setting it to very large values will
191-
improve performance.
184+
This setting limits the maximum age of the running transaction to
185+
'nrsec' seconds. The default value is 5 seconds. This means that if
186+
you lose your power, you will lose as much as the latest 5 seconds of
187+
metadata changes (your filesystem will not be damaged though, thanks
188+
to the journaling). This default value (or any low value) will hurt
189+
performance, but it's good for data-safety. Setting it to 0 will have
190+
the same effect as leaving it at the default (5 seconds). Setting it
191+
to very large values will improve performance. Note that due to
192+
delayed allocation even older data can be lost on power failure since
193+
writeback of those data begins only after time set in
194+
/proc/sys/vm/dirty_expire_centisecs.
192195

193196
barrier=<0|1(*)>, barrier(*), nobarrier
194197
This enables/disables the use of write barriers in the jbd code.

Documentation/admin-guide/xfs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ The following sysctls are available for the XFS filesystem:
253253
pool.
254254

255255
fs.xfs.speculative_prealloc_lifetime
256-
(Units: seconds Min: 1 Default: 300 Max: 86400)
256+
(Units: seconds Min: 1 Default: 300 Max: 86400)
257257
The interval at which the background scanning for inodes
258258
with unused speculative preallocation runs. The scan
259259
removes unused preallocation from clean inodes and releases

Documentation/dev-tools/kcov.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,11 @@ selectively from different subsystems.
251251
.. code-block:: c
252252
253253
struct kcov_remote_arg {
254-
unsigned trace_mode;
255-
unsigned area_size;
256-
unsigned num_handles;
257-
uint64_t common_handle;
258-
uint64_t handles[0];
254+
__u32 trace_mode;
255+
__u32 area_size;
256+
__u32 num_handles;
257+
__aligned_u64 common_handle;
258+
__aligned_u64 handles[0];
259259
};
260260
261261
#define KCOV_INIT_TRACE _IOR('c', 1, unsigned long)

Documentation/dev-tools/kselftest.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ Test Module
203203
Kselftest tests the kernel from userspace. Sometimes things need
204204
testing from within the kernel, one method of doing this is to create a
205205
test module. We can tie the module into the kselftest framework by
206-
using a shell script test runner. ``kselftest_module.sh`` is designed
206+
using a shell script test runner. ``kselftest/module.sh`` is designed
207207
to facilitate this process. There is also a header file provided to
208208
assist writing kernel modules that are for use with kselftest:
209209

210210
- ``tools/testing/kselftest/kselftest_module.h``
211-
- ``tools/testing/kselftest/kselftest_module.sh``
211+
- ``tools/testing/kselftest/kselftest/module.sh``
212212

213213
How to use
214214
----------
@@ -247,7 +247,7 @@ A bare bones test module might look like this:
247247
248248
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
249249
250-
#include "../tools/testing/selftests/kselftest_module.h"
250+
#include "../tools/testing/selftests/kselftest/module.h"
251251
252252
KSTM_MODULE_GLOBALS();
253253
@@ -276,7 +276,7 @@ Example test script
276276
277277
#!/bin/bash
278278
# SPDX-License-Identifier: GPL-2.0+
279-
$(dirname $0)/../kselftest_module.sh "foo" test_foo
279+
$(dirname $0)/../kselftest/module.sh "foo" test_foo
280280
281281
282282
Test Harness

Documentation/dev-tools/kunit/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ KUnit - Unit Testing for the Linux Kernel
99

1010
start
1111
usage
12+
kunit-tool
1213
api/index
1314
faq
1415

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
=================
4+
kunit_tool How-To
5+
=================
6+
7+
What is kunit_tool?
8+
===================
9+
10+
kunit_tool is a script (``tools/testing/kunit/kunit.py``) that aids in building
11+
the Linux kernel as UML (`User Mode Linux
12+
<http://user-mode-linux.sourceforge.net/>`_), running KUnit tests, parsing
13+
the test results and displaying them in a user friendly manner.
14+
15+
What is a kunitconfig?
16+
======================
17+
18+
It's just a defconfig that kunit_tool looks for in the base directory.
19+
kunit_tool uses it to generate a .config as you might expect. In addition, it
20+
verifies that the generated .config contains the CONFIG options in the
21+
kunitconfig; the reason it does this is so that it is easy to be sure that a
22+
CONFIG that enables a test actually ends up in the .config.
23+
24+
How do I use kunit_tool?
25+
========================
26+
27+
If a kunitconfig is present at the root directory, all you have to do is:
28+
29+
.. code-block:: bash
30+
31+
./tools/testing/kunit/kunit.py run
32+
33+
However, you most likely want to use it with the following options:
34+
35+
.. code-block:: bash
36+
37+
./tools/testing/kunit/kunit.py run --timeout=30 --jobs=`nproc --all`
38+
39+
- ``--timeout`` sets a maximum amount of time to allow tests to run.
40+
- ``--jobs`` sets the number of threads to use to build the kernel.
41+
42+
If you just want to use the defconfig that ships with the kernel, you can
43+
append the ``--defconfig`` flag as well:
44+
45+
.. code-block:: bash
46+
47+
./tools/testing/kunit/kunit.py run --timeout=30 --jobs=`nproc --all` --defconfig
48+
49+
.. note::
50+
This command is particularly helpful for getting started because it
51+
just works. No kunitconfig needs to be present.
52+
53+
For a list of all the flags supported by kunit_tool, you can run:
54+
55+
.. code-block:: bash
56+
57+
./tools/testing/kunit/kunit.py run --help

0 commit comments

Comments
 (0)