Skip to content

Commit 44f10db

Browse files
committed
Merge branch 'master' into mm-hotfixes-stable
2 parents 0a30901 + e55e5df commit 44f10db

File tree

10,103 files changed

+356790
-108803
lines changed

Some content is hidden

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

10,103 files changed

+356790
-108803
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ ForEachMacros:
254254
- 'for_each_free_mem_range'
255255
- 'for_each_free_mem_range_reverse'
256256
- 'for_each_func_rsrc'
257+
- 'for_each_group_device'
257258
- 'for_each_group_evsel'
258259
- 'for_each_group_member'
259260
- 'for_each_hstate'

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.[ch] diff=cpp
33
*.dts diff=dts
44
*.dts[io] diff=dts
5+
*.rs diff=rust

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ Henrik Rydberg <[email protected]>
183183
Herbert Xu <[email protected]>
184184
185185
186+
187+
186188
Jacob Shin <[email protected]>
187189
188190
@@ -330,6 +332,7 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
330332
Mauro Carvalho Chehab <[email protected]> <[email protected]>
331333
Maxim Mikityanskiy <[email protected]> <[email protected]>
332334
Maxim Mikityanskiy <[email protected]> <[email protected]>
335+
333336
334337
335338
Mayuresh Janorkar <[email protected]>

CREDITS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,12 @@ E: [email protected]
383383
W: http://tomas.nocrew.org/
384384
D: dsp56k device driver
385385

386+
N: Srivatsa S. Bhat
387+
388+
D: Maintainer of Generic Paravirt-Ops subsystem
389+
D: Maintainer of VMware hypervisor interface
390+
D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)
391+
386392
N: Ross Biro
387393
388394
D: Original author of the Linux networking code

Documentation/ABI/testing/sysfs-class-led-trigger-netdev

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ Description:
1313
Specifies the duration of the LED blink in milliseconds.
1414
Defaults to 50 ms.
1515

16+
With hw_control ON, the interval value MUST be set to the
17+
default value and cannot be changed.
18+
Trying to set any value in this specific mode will return
19+
an EINVAL error.
20+
1621
What: /sys/class/leds/<led>/link
1722
Date: Dec 2017
1823
KernelVersion: 4.16
@@ -39,6 +44,9 @@ Description:
3944
If set to 1, the LED will blink for the milliseconds specified
4045
in interval to signal transmission.
4146

47+
With hw_control ON, the blink interval is controlled by hardware
48+
and won't reflect the value set in interval.
49+
4250
What: /sys/class/leds/<led>/rx
4351
Date: Dec 2017
4452
KernelVersion: 4.16
@@ -50,3 +58,84 @@ Description:
5058

5159
If set to 1, the LED will blink for the milliseconds specified
5260
in interval to signal reception.
61+
62+
With hw_control ON, the blink interval is controlled by hardware
63+
and won't reflect the value set in interval.
64+
65+
What: /sys/class/leds/<led>/hw_control
66+
Date: Jun 2023
67+
KernelVersion: 6.5
68+
69+
Description:
70+
Communicate whether the LED trigger modes are driven by hardware
71+
or software fallback is used.
72+
73+
If 0, the LED is using software fallback to blink.
74+
75+
If 1, the LED is using hardware control to blink and signal the
76+
requested modes.
77+
78+
What: /sys/class/leds/<led>/link_10
79+
Date: Jun 2023
80+
KernelVersion: 6.5
81+
82+
Description:
83+
Signal the link speed state of 10Mbps of the named network device.
84+
85+
If set to 0 (default), the LED's normal state is off.
86+
87+
If set to 1, the LED's normal state reflects the link state
88+
speed of 10MBps of the named network device.
89+
Setting this value also immediately changes the LED state.
90+
91+
What: /sys/class/leds/<led>/link_100
92+
Date: Jun 2023
93+
KernelVersion: 6.5
94+
95+
Description:
96+
Signal the link speed state of 100Mbps of the named network device.
97+
98+
If set to 0 (default), the LED's normal state is off.
99+
100+
If set to 1, the LED's normal state reflects the link state
101+
speed of 100Mbps of the named network device.
102+
Setting this value also immediately changes the LED state.
103+
104+
What: /sys/class/leds/<led>/link_1000
105+
Date: Jun 2023
106+
KernelVersion: 6.5
107+
108+
Description:
109+
Signal the link speed state of 1000Mbps of the named network device.
110+
111+
If set to 0 (default), the LED's normal state is off.
112+
113+
If set to 1, the LED's normal state reflects the link state
114+
speed of 1000Mbps of the named network device.
115+
Setting this value also immediately changes the LED state.
116+
117+
What: /sys/class/leds/<led>/half_duplex
118+
Date: Jun 2023
119+
KernelVersion: 6.5
120+
121+
Description:
122+
Signal the link half duplex state of the named network device.
123+
124+
If set to 0 (default), the LED's normal state is off.
125+
126+
If set to 1, the LED's normal state reflects the link half
127+
duplex state of the named network device.
128+
Setting this value also immediately changes the LED state.
129+
130+
What: /sys/class/leds/<led>/full_duplex
131+
Date: Jun 2023
132+
KernelVersion: 6.5
133+
134+
Description:
135+
Signal the link full duplex state of the named network device.
136+
137+
If set to 0 (default), the LED's normal state is off.
138+
139+
If set to 1, the LED's normal state reflects the link full
140+
duplex state of the named network device.
141+
Setting this value also immediately changes the LED state.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ Description: Preferred MTE tag checking mode
670670
"async" Prefer asynchronous mode
671671
================ ==============================================
672672

673-
See also: Documentation/arm64/memory-tagging-extension.rst
673+
See also: Documentation/arch/arm64/memory-tagging-extension.rst
674674

675675
What: /sys/devices/system/cpu/nohz_full
676676
Date: Apr 2015

Documentation/RCU/Design/Requirements/Requirements.rst

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,41 +2071,7 @@ call.
20712071

20722072
Because RCU avoids interrupting idle CPUs, it is illegal to execute an
20732073
RCU read-side critical section on an idle CPU. (Kernels built with
2074-
``CONFIG_PROVE_RCU=y`` will splat if you try it.) The RCU_NONIDLE()
2075-
macro and ``_rcuidle`` event tracing is provided to work around this
2076-
restriction. In addition, rcu_is_watching() may be used to test
2077-
whether or not it is currently legal to run RCU read-side critical
2078-
sections on this CPU. I learned of the need for diagnostics on the one
2079-
hand and RCU_NONIDLE() on the other while inspecting idle-loop code.
2080-
Steven Rostedt supplied ``_rcuidle`` event tracing, which is used quite
2081-
heavily in the idle loop. However, there are some restrictions on the
2082-
code placed within RCU_NONIDLE():
2083-
2084-
#. Blocking is prohibited. In practice, this is not a serious
2085-
restriction given that idle tasks are prohibited from blocking to
2086-
begin with.
2087-
#. Although nesting RCU_NONIDLE() is permitted, they cannot nest
2088-
indefinitely deeply. However, given that they can be nested on the
2089-
order of a million deep, even on 32-bit systems, this should not be a
2090-
serious restriction. This nesting limit would probably be reached
2091-
long after the compiler OOMed or the stack overflowed.
2092-
#. Any code path that enters RCU_NONIDLE() must sequence out of that
2093-
same RCU_NONIDLE(). For example, the following is grossly
2094-
illegal:
2095-
2096-
::
2097-
2098-
1 RCU_NONIDLE({
2099-
2 do_something();
2100-
3 goto bad_idea; /* BUG!!! */
2101-
4 do_something_else();});
2102-
5 bad_idea:
2103-
2104-
2105-
It is just as illegal to transfer control into the middle of
2106-
RCU_NONIDLE()'s argument. Yes, in theory, you could transfer in
2107-
as long as you also transferred out, but in practice you could also
2108-
expect to get sharply worded review comments.
2074+
``CONFIG_PROVE_RCU=y`` will splat if you try it.)
21092075

21102076
It is similarly socially unacceptable to interrupt an ``nohz_full`` CPU
21112077
running in userspace. RCU must therefore track ``nohz_full`` userspace

Documentation/RCU/whatisRCU.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,6 @@ All: lockdep-checked RCU utility APIs::
11171117

11181118
RCU_LOCKDEP_WARN
11191119
rcu_sleep_check
1120-
RCU_NONIDLE
11211120

11221121
All: Unchecked RCU-protected pointer access::
11231122

Documentation/admin-guide/bcache.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,6 @@ cache_miss_collisions
508508
cache miss, but raced with a write and data was already present (usually 0
509509
since the synchronization for cache misses was rewritten)
510510

511-
cache_readaheads
512-
Count of times readahead occurred.
513-
514511
Sysfs - cache set
515512
~~~~~~~~~~~~~~~~~
516513

Documentation/admin-guide/cgroup-v1/memory.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ Lock order is as follows::
297297

298298
Page lock (PG_locked bit of page->flags)
299299
mm->page_table_lock or split pte_lock
300-
lock_page_memcg (memcg->move_lock)
300+
folio_memcg_lock (memcg->move_lock)
301301
mapping->i_pages lock
302302
lruvec->lru_lock.
303303

0 commit comments

Comments
 (0)