Skip to content

Commit 4fc31ba

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 0e18dd1 + b29c6ef commit 4fc31ba

File tree

1,474 files changed

+51372
-17953
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,474 files changed

+51372
-17953
lines changed

‎Documentation/ABI/stable/sysfs-devices

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Note: This documents additional properties of any device beyond what
2-
# is documented in Documentation/sysfs-rules.txt
2+
# is documented in Documentation/admin-guide/sysfs-rules.rst
33

44
What: /sys/devices/*/of_node
55
Date: February 2015

‎Documentation/ABI/testing/evm

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,37 @@ Description:
77
HMAC-sha1 value across the extended attributes, storing the
88
value as the extended attribute 'security.evm'.
99

10-
EVM depends on the Kernel Key Retention System to provide it
11-
with a trusted/encrypted key for the HMAC-sha1 operation.
12-
The key is loaded onto the root's keyring using keyctl. Until
13-
EVM receives notification that the key has been successfully
14-
loaded onto the keyring (echo 1 > <securityfs>/evm), EVM
15-
can not create or validate the 'security.evm' xattr, but
16-
returns INTEGRITY_UNKNOWN. Loading the key and signaling EVM
17-
should be done as early as possible. Normally this is done
18-
in the initramfs, which has already been measured as part
19-
of the trusted boot. For more information on creating and
20-
loading existing trusted/encrypted keys, refer to:
21-
Documentation/keys-trusted-encrypted.txt. (A sample dracut
22-
patch, which loads the trusted/encrypted key and enables
23-
EVM, is available from http://linux-ima.sourceforge.net/#EVM.)
10+
EVM supports two classes of security.evm. The first is
11+
an HMAC-sha1 generated locally with a
12+
trusted/encrypted key stored in the Kernel Key
13+
Retention System. The second is a digital signature
14+
generated either locally or remotely using an
15+
asymmetric key. These keys are loaded onto root's
16+
keyring using keyctl, and EVM is then enabled by
17+
echoing a value to <securityfs>/evm:
18+
19+
1: enable HMAC validation and creation
20+
2: enable digital signature validation
21+
3: enable HMAC and digital signature validation and HMAC
22+
creation
23+
24+
Further writes will be blocked if HMAC support is enabled or
25+
if bit 32 is set:
26+
27+
echo 0x80000002 ><securityfs>/evm
28+
29+
will enable digital signature validation and block
30+
further writes to <securityfs>/evm.
31+
32+
Until this is done, EVM can not create or validate the
33+
'security.evm' xattr, but returns INTEGRITY_UNKNOWN.
34+
Loading keys and signaling EVM should be done as early
35+
as possible. Normally this is done in the initramfs,
36+
which has already been measured as part of the trusted
37+
boot. For more information on creating and loading
38+
existing trusted/encrypted keys, refer to:
39+
40+
Documentation/security/keys/trusted-encrypted.rst. Both dracut
41+
(via 97masterkey and 98integrity) and systemd (via
42+
core/ima-setup) have support for loading keys at boot
43+
time.

‎Documentation/ABI/testing/sysfs-bus-mmc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
What: /sys/bus/mmc/devices/.../rev
2+
Date: October 2017
3+
Contact: Jin Qian <jinqian@android.com>
4+
Description: Extended CSD revision number

‎Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ Description: Processor frequency boosting control
187187
This switch controls the boost setting for the whole system.
188188
Boosting allows the CPU and the firmware to run at a frequency
189189
beyound it's nominal limit.
190-
More details can be found in Documentation/cpu-freq/boost.txt
190+
More details can be found in
191+
Documentation/admin-guide/pm/cpufreq.rst
191192

192193

193194
What: /sys/devices/system/cpu/cpu#/crash_notes
@@ -223,7 +224,8 @@ Description: Parameters for the Intel P-state driver
223224
no_turbo: limits the driver to selecting P states below the turbo
224225
frequency range.
225226

226-
More details can be found in Documentation/cpu-freq/intel-pstate.txt
227+
More details can be found in
228+
Documentation/admin-guide/pm/intel_pstate.rst
227229

228230
What: /sys/devices/system/cpu/cpu*/cache/index*/<set_of_attributes_mentioned_below>
229231
Date: July 2014(documented, existed before August 2008)

‎Documentation/ABI/testing/sysfs-power

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ Description:
1818
Writing one of the above strings to this file causes the system
1919
to transition into the corresponding state, if available.
2020

21-
See Documentation/power/states.txt for more information.
21+
See Documentation/admin-guide/pm/sleep-states.rst for more
22+
information.
2223

2324
What: /sys/power/mem_sleep
2425
Date: November 2016
@@ -35,7 +36,8 @@ Description:
3536
represented by it to be used on subsequent attempts to suspend
3637
the system.
3738

38-
See Documentation/power/states.txt for more information.
39+
See Documentation/admin-guide/pm/sleep-states.rst for more
40+
information.
3941

4042
What: /sys/power/disk
4143
Date: September 2006

‎Documentation/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ endif # HAVE_SPHINX
9797
# The following targets are independent of HAVE_SPHINX, and the rules should
9898
# work or silently pass without Sphinx.
9999

100+
refcheckdocs:
101+
$(Q)cd $(srctree);scripts/documentation-file-ref-check
102+
100103
cleandocs:
101104
$(Q)rm -rf $(BUILDDIR)
102105
$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean
@@ -109,10 +112,13 @@ dochelp:
109112
@echo ' epubdocs - EPUB'
110113
@echo ' xmldocs - XML'
111114
@echo ' linkcheckdocs - check for broken external links (will connect to external hosts)'
115+
@echo ' refcheckdocs - check for references to non-existing files under Documentation'
112116
@echo ' cleandocs - clean all generated files'
113117
@echo
114118
@echo ' make SPHINXDIRS="s1 s2" [target] Generate only docs of folder s1, s2'
115119
@echo ' valid values for SPHINXDIRS are: $(_SPHINXDIRS)'
116120
@echo
117121
@echo ' make SPHINX_CONF={conf-file} [target] use *additional* sphinx-build'
118122
@echo ' configuration. This is e.g. useful to build with nit-picking config.'
123+
@echo
124+
@echo ' Default location for the generated documents is Documentation/output'

‎Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ <h3><a name="Use of Workqueues">Use of Workqueues</a></h3>
527527
This straightforward approach had the disadvantage of needing to
528528
account for POSIX signals sent to user tasks,
529529
so more recent implemementations use the Linux kernel's
530-
<a href="https://www.kernel.org/doc/Documentation/workqueue.txt">workqueues</a>.
530+
<a href="https://www.kernel.org/doc/Documentation/core-api/workqueue.rst">workqueues</a>.
531531

532532
<p>
533533
The requesting task still does counter snapshotting and funnel-lock

‎Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2+
"http://www.w3.org/TR/html4/loose.dtd">
3+
<html>
4+
<head><title>A Diagram of TREE_RCU's Grace-Period Memory Ordering</title>
5+
<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
6+
7+
<p><img src="TreeRCU-gp.svg" alt="TreeRCU-gp.svg">
8+
9+
</body></html>

0 commit comments

Comments
 (0)