Skip to content

Commit 74acee3

Browse files
author
Jiri Kosina
committed
Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus
5 parents 4c12954 + cca4786 + eca0f0a + dbcbabf + 6e2abc6 commit 74acee3

File tree

29,527 files changed

+541587
-470316
lines changed

Some content is hidden

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

29,527 files changed

+541587
-470316
lines changed

.clang-format

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,14 +387,14 @@ ForEachMacros:
387387
- 'rhl_for_each_entry_rcu'
388388
- 'rhl_for_each_rcu'
389389
- 'rht_for_each'
390-
- 'rht_for_each_continue'
390+
- 'rht_for_each_from'
391391
- 'rht_for_each_entry'
392-
- 'rht_for_each_entry_continue'
392+
- 'rht_for_each_entry_from'
393393
- 'rht_for_each_entry_rcu'
394-
- 'rht_for_each_entry_rcu_continue'
394+
- 'rht_for_each_entry_rcu_from'
395395
- 'rht_for_each_entry_safe'
396396
- 'rht_for_each_rcu'
397-
- 'rht_for_each_rcu_continue'
397+
- 'rht_for_each_rcu_from'
398398
- '__rq_for_each_bio'
399399
- 'rq_for_each_bvec'
400400
- 'rq_for_each_segment'

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
Christoph Hellwig <[email protected]>
2+
Marc Gonzalez <[email protected]>

.gitignore

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ modules.builtin
5858
/vmlinuz
5959
/System.map
6060
/Module.markers
61+
/modules.builtin.modinfo
6162

6263
#
6364
# RPM spec file (make rpm-pkg)
@@ -80,20 +81,22 @@ modules.builtin
8081
/tar-install/
8182

8283
#
83-
# git files that we don't want to ignore even if they are dot-files
84+
# We don't want to ignore the following even if they are dot-files
8485
#
86+
!.clang-format
87+
!.cocciconfig
88+
!.get_maintainer.ignore
89+
!.gitattributes
8590
!.gitignore
8691
!.mailmap
87-
!.cocciconfig
88-
!.clang-format
8992

9093
#
9194
# Generated include files
9295
#
93-
include/config
94-
include/generated
95-
include/ksym
96-
arch/*/include/generated
96+
/include/config/
97+
/include/generated/
98+
/include/ksym/
99+
/arch/*/include/generated/
97100

98101
# stgit generated dirs
99102
patches-*
@@ -129,7 +132,12 @@ signing_key.x509
129132
x509.genkey
130133

131134
# Kconfig presets
132-
all.config
135+
/all.config
136+
/alldef.config
137+
/allmod.config
138+
/allno.config
139+
/allrandom.config
140+
/allyes.config
133141

134142
# Kdevelop4
135143
*.kdev4

.mailmap

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Alan Cox <[email protected]>
1616
1717
Aleksey Gorelov <[email protected]>
1818
Aleksandar Markovic <[email protected]> <[email protected]>
19+
20+
21+
Alexei Starovoitov <[email protected]> <[email protected]>
22+
Alexei Starovoitov <[email protected]> <[email protected]>
23+
Alexei Starovoitov <[email protected]> <[email protected]>
1924
2025
2126
@@ -46,6 +51,12 @@ Christoph Hellwig <[email protected]>
4651
Christophe Ricard <[email protected]>
4752
Corey Minyard <[email protected]>
4853
Damian Hobson-Garcia <[email protected]>
54+
55+
56+
57+
58+
59+
4960
David Brownell <[email protected]>
5061
David Woodhouse <[email protected]>
5162
@@ -70,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)>
7081
Greg Kroah-Hartman <[email protected]>
7182
Greg Kroah-Hartman <[email protected]>
7283
84+
7385
Henk Vergonet <[email protected]>
7486
Henrik Kretzschmar <[email protected]>
7587
Henrik Rydberg <[email protected]>
@@ -117,6 +129,8 @@ Leonid I Ananiev <[email protected]>
117129
Linas Vepstas <[email protected]>
118130
119131
132+
133+
120134
121135
122136
Mark Brown <[email protected]>
@@ -189,6 +203,7 @@ Santosh Shilimkar <[email protected]>
189203
Santosh Shilimkar <[email protected]>
190204
Sascha Hauer <[email protected]>
191205
S.Çağlar Onur <[email protected]>
206+
192207
193208
194209
@@ -207,6 +222,8 @@ Tejun Heo <[email protected]>
207222
Thomas Graf <[email protected]>
208223
Thomas Pedersen <[email protected]>
209224
Tony Luck <[email protected]>
225+
226+
210227
Tsuneo Yoshioka <[email protected]>
211228
Uwe Kleine-König <[email protected]>
212229
Uwe Kleine-König <[email protected]>
@@ -222,6 +239,7 @@ Vlad Dogaru <[email protected]> <[email protected]>
222239
223240
224241
Takashi YOSHII <[email protected]>
242+
225243
226244
Yusuke Goda <[email protected]>
227245
Gustavo Padovan <[email protected]>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3364,6 +3364,14 @@ S: Braunschweiger Strasse 79
33643364
S: 31134 Hildesheim
33653365
S: Germany
33663366

3367+
N: Martin Schwidefsky
3368+
D: Martin was the most significant contributor to the initial s390
3369+
D: port of the Linux Kernel and later the maintainer of the s390
3370+
D: architecture backend for almost two decades.
3371+
D: He passed away in 2019, and will be greatly missed.
3372+
S: Germany
3373+
W: https://lwn.net/Articles/789028/
3374+
33673375
N: Marcel Selhorst
33683376
33693377
D: TPM driver

Documentation/ABI/testing/sysfs-class-net-batman-adv renamed to Documentation/ABI/obsolete/sysfs-class-net-batman-adv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
This ABI is deprecated and will be removed after 2021. It is
2+
replaced with the batadv generic netlink family.
13

24
What: /sys/class/net/<iface>/batman-adv/elp_interval
35
Date: Feb 2014

Documentation/ABI/testing/sysfs-class-net-mesh renamed to Documentation/ABI/obsolete/sysfs-class-net-mesh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
This ABI is deprecated and will be removed after 2021. It is
2+
replaced with the batadv generic netlink family.
13

24
What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
35
Date: May 2010

Documentation/ABI/stable/sysfs-bus-nvmem

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Description:
66
This file allows user to read/write the raw NVMEM contents.
77
Permissions for write to this file depends on the nvmem
88
provider configuration.
9+
Note: This file is only present if CONFIG_NVMEM_SYSFS
10+
is enabled
911

1012
ex:
1113
hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/latency
8181
Date: September. 2017
8282
KernelVersion: 4.14
8383
Contact: Stephen Hemminger <[email protected]>
84-
Description: Channel signaling latency
84+
Description: Channel signaling latency. This file is available only for
85+
performance critical channels (storage, network, etc.) that use
86+
the monitor page mechanism.
8587
Users: Debugging tools
8688

8789
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/out_mask
@@ -95,7 +97,9 @@ What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/pending
9597
Date: September. 2017
9698
KernelVersion: 4.14
9799
Contact: Stephen Hemminger <[email protected]>
98-
Description: Channel interrupt pending state
100+
Description: Channel interrupt pending state. This file is available only for
101+
performance critical channels (storage, network, etc.) that use
102+
the monitor page mechanism.
99103
Users: Debugging tools
100104

101105
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/read_avail
@@ -137,7 +141,9 @@ What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/monitor_id
137141
Date: January. 2018
138142
KernelVersion: 4.16
139143
Contact: Stephen Hemminger <[email protected]>
140-
Description: Monitor bit associated with channel
144+
Description: Monitor bit associated with channel. This file is available only
145+
for performance critical channels (storage, network, etc.) that
146+
use the monitor page mechanism.
141147
Users: Debugging tools and userspace drivers
142148

143149
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/ring

Documentation/ABI/stable/sysfs-devices-node

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,89 @@ Date: December 2009
9090
Contact: Lee Schermerhorn <[email protected]>
9191
Description:
9292
The node's huge page size control/query attributes.
93-
See Documentation/admin-guide/mm/hugetlbpage.rst
93+
See Documentation/admin-guide/mm/hugetlbpage.rst
94+
95+
What: /sys/devices/system/node/nodeX/accessY/
96+
Date: December 2018
97+
Contact: Keith Busch <[email protected]>
98+
Description:
99+
The node's relationship to other nodes for access class "Y".
100+
101+
What: /sys/devices/system/node/nodeX/accessY/initiators/
102+
Date: December 2018
103+
Contact: Keith Busch <[email protected]>
104+
Description:
105+
The directory containing symlinks to memory initiator
106+
nodes that have class "Y" access to this target node's
107+
memory. CPUs and other memory initiators in nodes not in
108+
the list accessing this node's memory may have different
109+
performance.
110+
111+
What: /sys/devices/system/node/nodeX/accessY/targets/
112+
Date: December 2018
113+
Contact: Keith Busch <[email protected]>
114+
Description:
115+
The directory containing symlinks to memory targets that
116+
this initiator node has class "Y" access.
117+
118+
What: /sys/devices/system/node/nodeX/accessY/initiators/read_bandwidth
119+
Date: December 2018
120+
Contact: Keith Busch <[email protected]>
121+
Description:
122+
This node's read bandwidth in MB/s when accessed from
123+
nodes found in this access class's linked initiators.
124+
125+
What: /sys/devices/system/node/nodeX/accessY/initiators/read_latency
126+
Date: December 2018
127+
Contact: Keith Busch <[email protected]>
128+
Description:
129+
This node's read latency in nanoseconds when accessed
130+
from nodes found in this access class's linked initiators.
131+
132+
What: /sys/devices/system/node/nodeX/accessY/initiators/write_bandwidth
133+
Date: December 2018
134+
Contact: Keith Busch <[email protected]>
135+
Description:
136+
This node's write bandwidth in MB/s when accessed from
137+
found in this access class's linked initiators.
138+
139+
What: /sys/devices/system/node/nodeX/accessY/initiators/write_latency
140+
Date: December 2018
141+
Contact: Keith Busch <[email protected]>
142+
Description:
143+
This node's write latency in nanoseconds when access
144+
from nodes found in this class's linked initiators.
145+
146+
What: /sys/devices/system/node/nodeX/memory_side_cache/indexY/
147+
Date: December 2018
148+
Contact: Keith Busch <[email protected]>
149+
Description:
150+
The directory containing attributes for the memory-side cache
151+
level 'Y'.
152+
153+
What: /sys/devices/system/node/nodeX/memory_side_cache/indexY/indexing
154+
Date: December 2018
155+
Contact: Keith Busch <[email protected]>
156+
Description:
157+
The caches associativity indexing: 0 for direct mapped,
158+
non-zero if indexed.
159+
160+
What: /sys/devices/system/node/nodeX/memory_side_cache/indexY/line_size
161+
Date: December 2018
162+
Contact: Keith Busch <[email protected]>
163+
Description:
164+
The number of bytes accessed from the next cache level on a
165+
cache miss.
166+
167+
What: /sys/devices/system/node/nodeX/memory_side_cache/indexY/size
168+
Date: December 2018
169+
Contact: Keith Busch <[email protected]>
170+
Description:
171+
The size of this memory side cache in bytes.
172+
173+
What: /sys/devices/system/node/nodeX/memory_side_cache/indexY/write_policy
174+
Date: December 2018
175+
Contact: Keith Busch <[email protected]>
176+
Description:
177+
The cache write policy: 0 for write-back, 1 for write-through,
178+
other or unknown.

0 commit comments

Comments
 (0)