Skip to content

Commit de5e4b1

Browse files
cristibirsancristibirsan
committed
Merge branch 'stable/linux-5.10.y' into linux-5.10-at91
2 parents 77932c6 + 43b0742 commit de5e4b1

657 files changed

Lines changed: 5440 additions & 2800 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/evm‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,30 @@ Description:
4949
modification of EVM-protected metadata and
5050
disable all further modification of policy
5151

52-
Note that once a key has been loaded, it will no longer be
53-
possible to enable metadata modification.
52+
Echoing a value is additive, the new value is added to the
53+
existing initialization flags.
54+
55+
For example, after::
56+
57+
echo 2 ><securityfs>/evm
58+
59+
another echo can be performed::
60+
61+
echo 1 ><securityfs>/evm
62+
63+
and the resulting value will be 3.
64+
65+
Note that once an HMAC key has been loaded, it will no longer
66+
be possible to enable metadata modification. Signaling that an
67+
HMAC key has been loaded will clear the corresponding flag.
68+
For example, if the current value is 6 (2 and 4 set)::
69+
70+
echo 1 ><securityfs>/evm
71+
72+
will set the new value to 3 (4 cleared).
73+
74+
Loading an HMAC key is the only way to disable metadata
75+
modification.
5476

5577
Until key loading has been signaled EVM can not create
5678
or validate the 'security.evm' xattr, but returns

‎Documentation/ABI/testing/sysfs-bus-papr-pmem‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ KernelVersion: v5.9
3939
Contact: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, linux-nvdimm@lists.01.org,
4040
Description:
4141
(RO) Report various performance stats related to papr-scm NVDIMM
42-
device. Each stat is reported on a new line with each line
43-
composed of a stat-identifier followed by it value. Below are
44-
currently known dimm performance stats which are reported:
42+
device. This attribute is only available for NVDIMM devices
43+
that support reporting NVDIMM performance stats. Each stat is
44+
reported on a new line with each line composed of a
45+
stat-identifier followed by it value. Below are currently known
46+
dimm performance stats which are reported:
4547

4648
* "CtlResCt" : Controller Reset Count
4749
* "CtlResTm" : Controller Reset Elapsed Time

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,12 @@
577577
loops can be debugged more effectively on production
578578
systems.
579579

580+
clocksource.max_cswd_read_retries= [KNL]
581+
Number of clocksource_watchdog() retries due to
582+
external delays before the clock will be marked
583+
unstable. Defaults to three retries, that is,
584+
four attempts to read the clock under test.
585+
580586
clearcpuid=BITNUM[,BITNUM...] [X86]
581587
Disable CPUID feature X for the kernel. See
582588
arch/x86/include/asm/cpufeatures.h for the valid bit

‎Documentation/hwmon/max31790.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Sysfs entries
3838
fan[1-12]_input RO fan tachometer speed in RPM
3939
fan[1-12]_fault RO fan experienced fault
4040
fan[1-6]_target RW desired fan speed in RPM
41-
pwm[1-6]_enable RW regulator mode, 0=disabled, 1=manual mode, 2=rpm mode
42-
pwm[1-6] RW fan target duty cycle (0-255)
41+
pwm[1-6]_enable RW regulator mode, 0=disabled (duty cycle=0%), 1=manual mode, 2=rpm mode
42+
pwm[1-6] RW read: current pwm duty cycle,
43+
write: target pwm duty cycle (0-255)
4344
================== === =======================================================

‎Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4030,7 +4030,7 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
40304030
:stub-columns: 0
40314031
:widths: 1 1 2
40324032

4033-
* - ``V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT``
4033+
* - ``V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED``
40344034
- 0x00000001
40354035
-
40364036
* - ``V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT``
@@ -4238,6 +4238,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
42384238
* - ``V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED``
42394239
- 0x00000100
42404240
-
4241+
* - ``V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT``
4242+
- 0x00000200
4243+
-
42414244

42424245
.. c:type:: v4l2_hevc_dpb_entry
42434246

‎Documentation/vm/arch_pgtable_helpers.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PTE Page Table Helpers
5050
+---------------------------+--------------------------------------------------+
5151
| pte_mkwrite | Creates a writable PTE |
5252
+---------------------------+--------------------------------------------------+
53-
| pte_mkwrprotect | Creates a write protected PTE |
53+
| pte_wrprotect | Creates a write protected PTE |
5454
+---------------------------+--------------------------------------------------+
5555
| pte_mkspecial | Creates a special PTE |
5656
+---------------------------+--------------------------------------------------+
@@ -120,7 +120,7 @@ PMD Page Table Helpers
120120
+---------------------------+--------------------------------------------------+
121121
| pmd_mkwrite | Creates a writable PMD |
122122
+---------------------------+--------------------------------------------------+
123-
| pmd_mkwrprotect | Creates a write protected PMD |
123+
| pmd_wrprotect | Creates a write protected PMD |
124124
+---------------------------+--------------------------------------------------+
125125
| pmd_mkspecial | Creates a special PMD |
126126
+---------------------------+--------------------------------------------------+
@@ -186,7 +186,7 @@ PUD Page Table Helpers
186186
+---------------------------+--------------------------------------------------+
187187
| pud_mkwrite | Creates a writable PUD |
188188
+---------------------------+--------------------------------------------------+
189-
| pud_mkwrprotect | Creates a write protected PUD |
189+
| pud_wrprotect | Creates a write protected PUD |
190190
+---------------------------+--------------------------------------------------+
191191
| pud_mkdevmap | Creates a ZONE_DEVICE mapped PUD |
192192
+---------------------------+--------------------------------------------------+
@@ -224,7 +224,7 @@ HugeTLB Page Table Helpers
224224
+---------------------------+--------------------------------------------------+
225225
| huge_pte_mkwrite | Creates a writable HugeTLB |
226226
+---------------------------+--------------------------------------------------+
227-
| huge_pte_mkwrprotect | Creates a write protected HugeTLB |
227+
| huge_pte_wrprotect | Creates a write protected HugeTLB |
228228
+---------------------------+--------------------------------------------------+
229229
| huge_ptep_get_and_clear | Clears a HugeTLB |
230230
+---------------------------+--------------------------------------------------+

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 10
4-
SUBLEVEL = 47
4+
SUBLEVEL = 50
55
EXTRAVERSION =
66
NAME = Dare mighty things
77

@@ -978,7 +978,7 @@ LDFLAGS_vmlinux += $(call ld-option, -X,)
978978
endif
979979

980980
ifeq ($(CONFIG_RELR),y)
981-
LDFLAGS_vmlinux += --pack-dyn-relocs=relr
981+
LDFLAGS_vmlinux += --pack-dyn-relocs=relr --use-android-relr-tags
982982
endif
983983

984984
# We never want expected sections to be placed heuristically by the

‎arch/alpha/kernel/smp.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ smp_callin(void)
166166
DBGS(("smp_callin: commencing CPU %d current %p active_mm %p\n",
167167
cpuid, current, current->active_mm));
168168

169-
preempt_disable();
170169
cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
171170
}
172171

‎arch/arc/kernel/smp.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ void start_kernel_secondary(void)
189189
pr_info("## CPU%u LIVE ##: Executing Code...\n", cpu);
190190

191191
local_irq_enable();
192-
preempt_disable();
193192
cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
194193
}
195194

‎arch/arm/boot/dts/ste-href.dtsi‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
#include <dt-bindings/interrupt-controller/irq.h>
7+
#include <dt-bindings/leds/common.h>
78
#include "ste-href-family-pinctrl.dtsi"
89

910
/ {
@@ -64,17 +65,20 @@
6465
reg = <0>;
6566
led-cur = /bits/ 8 <0x2f>;
6667
max-cur = /bits/ 8 <0x5f>;
68+
color = <LED_COLOR_ID_BLUE>;
6769
linux,default-trigger = "heartbeat";
6870
};
6971
chan@1 {
7072
reg = <1>;
7173
led-cur = /bits/ 8 <0x2f>;
7274
max-cur = /bits/ 8 <0x5f>;
75+
color = <LED_COLOR_ID_BLUE>;
7376
};
7477
chan@2 {
7578
reg = <2>;
7679
led-cur = /bits/ 8 <0x2f>;
7780
max-cur = /bits/ 8 <0x5f>;
81+
color = <LED_COLOR_ID_BLUE>;
7882
};
7983
};
8084
lp5521@34 {
@@ -88,16 +92,19 @@
8892
reg = <0>;
8993
led-cur = /bits/ 8 <0x2f>;
9094
max-cur = /bits/ 8 <0x5f>;
95+
color = <LED_COLOR_ID_BLUE>;
9196
};
9297
chan@1 {
9398
reg = <1>;
9499
led-cur = /bits/ 8 <0x2f>;
95100
max-cur = /bits/ 8 <0x5f>;
101+
color = <LED_COLOR_ID_BLUE>;
96102
};
97103
chan@2 {
98104
reg = <2>;
99105
led-cur = /bits/ 8 <0x2f>;
100106
max-cur = /bits/ 8 <0x5f>;
107+
color = <LED_COLOR_ID_BLUE>;
101108
};
102109
};
103110
bh1780@29 {

0 commit comments

Comments
 (0)