Skip to content

Commit c86aa01

Browse files
author
Jiri Kosina
committed
Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus
Pull assorted small fixes queued for merge window.
3 parents e56236b + 648d493 + 7ad8148 commit c86aa01

File tree

8,646 files changed

+468464
-179619
lines changed

Some content is hidden

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

8,646 files changed

+468464
-179619
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ modules.builtin
5555
/System.map
5656
/Module.markers
5757

58+
#
59+
# RPM spec file (make rpm-pkg)
60+
#
61+
/*.spec
62+
5863
#
5964
# Debian directory (make deb-pkg)
6065
#

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ James E Wilson <[email protected]>
7373
James Hogan <[email protected]> <[email protected]>
7474
James Hogan <[email protected]> <[email protected]>
7575
James Ketrenos <jketreno@io.(none)>
76+
Jason Gunthorpe <[email protected]> <[email protected]>
77+
Jason Gunthorpe <[email protected]> <[email protected]>
7678
Javi Merino <[email protected]> <[email protected]>
7779
<[email protected]> <[email protected]>
7880
Jean Tourrilhes <[email protected]>

‎Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,73 @@ KernelVersion: 4.5
4141
Contact: K. Y. Srinivasan <[email protected]>
4242
Description: The 16 bit vendor ID of the device
4343
Users: tools/hv/lsvmbus and user level RDMA libraries
44+
45+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu
46+
Date: September. 2017
47+
KernelVersion: 4.14
48+
Contact: Stephen Hemminger <[email protected]>
49+
Description: VCPU (sub)channel is affinitized to
50+
Users: tools/hv/lsvmbus and other debuggig tools
51+
52+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu
53+
Date: September. 2017
54+
KernelVersion: 4.14
55+
Contact: Stephen Hemminger <[email protected]>
56+
Description: VCPU (sub)channel is affinitized to
57+
Users: tools/hv/lsvmbus and other debuggig tools
58+
59+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/in_mask
60+
Date: September. 2017
61+
KernelVersion: 4.14
62+
Contact: Stephen Hemminger <[email protected]>
63+
Description: Inbound channel signaling state
64+
Users: Debugging tools
65+
66+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/latency
67+
Date: September. 2017
68+
KernelVersion: 4.14
69+
Contact: Stephen Hemminger <[email protected]>
70+
Description: Channel signaling latency
71+
Users: Debugging tools
72+
73+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/out_mask
74+
Date: September. 2017
75+
KernelVersion: 4.14
76+
Contact: Stephen Hemminger <[email protected]>
77+
Description: Outbound channel signaling state
78+
Users: Debugging tools
79+
80+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/pending
81+
Date: September. 2017
82+
KernelVersion: 4.14
83+
Contact: Stephen Hemminger <[email protected]>
84+
Description: Channel interrupt pending state
85+
Users: Debugging tools
86+
87+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/read_avail
88+
Date: September. 2017
89+
KernelVersion: 4.14
90+
Contact: Stephen Hemminger <[email protected]>
91+
Description: Bytes availabble to read
92+
Users: Debugging tools
93+
94+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/write_avail
95+
Date: September. 2017
96+
KernelVersion: 4.14
97+
Contact: Stephen Hemminger <[email protected]>
98+
Description: Bytes availabble to write
99+
Users: Debugging tools
100+
101+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/events
102+
Date: September. 2017
103+
KernelVersion: 4.14
104+
Contact: Stephen Hemminger <[email protected]>
105+
Description: Number of times we have signaled the host
106+
Users: Debugging tools
107+
108+
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/interrupts
109+
Date: September. 2017
110+
KernelVersion: 4.14
111+
Contact: Stephen Hemminger <[email protected]>
112+
Description: Number of times we have taken an interrupt (incoming)
113+
Users: Debugging tools

‎Documentation/ABI/testing/dell-smbios-wmi

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
What: /dev/wmi/dell-smbios
2+
Date: November 2017
3+
KernelVersion: 4.15
4+
Contact: "Mario Limonciello" <[email protected]>
5+
Description:
6+
Perform SMBIOS calls on supported Dell machines.
7+
through the Dell ACPI-WMI interface.
8+
9+
IOCTL's and buffer formats are defined in:
10+
<uapi/linux/wmi.h>
11+
12+
1) To perform an SMBIOS call from userspace, you'll need to
13+
first determine the minimum size of the calling interface
14+
buffer for your machine.
15+
Platforms that contain larger buffers can return larger
16+
objects from the system firmware.
17+
Commonly this size is either 4k or 32k.
18+
19+
To determine the size of the buffer read() a u64 dword from
20+
the WMI character device /dev/wmi/dell-smbios.
21+
22+
2) After you've determined the minimum size of the calling
23+
interface buffer, you can allocate a structure that represents
24+
the structure documented above.
25+
26+
3) In the 'length' object store the size of the buffer you
27+
determined above and allocated.
28+
29+
4) In this buffer object, prepare as necessary for the SMBIOS
30+
call you're interested in. Typically SMBIOS buffers have
31+
"class", "select", and "input" defined to values that coincide
32+
with the data you are interested in.
33+
Documenting class/select/input values is outside of the scope
34+
of this documentation. Check with the libsmbios project for
35+
further documentation on these values.
36+
37+
6) Run the call by using ioctl() as described in the header.
38+
39+
7) The output will be returned in the buffer object.
40+
41+
8) Be sure to free up your allocated object.

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,51 @@ Description: When new NVM image is written to the non-active NVM
110110
is directly the status value from the DMA configuration
111111
based mailbox before the device is power cycled. Writing
112112
0 here clears the status.
113+
114+
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/key
115+
Date: Jan 2018
116+
KernelVersion: 4.15
117+
Contact: [email protected]
118+
Description: This contains name of the property directory the XDomain
119+
service exposes. This entry describes the protocol in
120+
question. Following directories are already reserved by
121+
the Apple XDomain specification:
122+
123+
network: IP/ethernet over Thunderbolt
124+
targetdm: Target disk mode protocol over Thunderbolt
125+
extdisp: External display mode protocol over Thunderbolt
126+
127+
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/modalias
128+
Date: Jan 2018
129+
KernelVersion: 4.15
130+
Contact: [email protected]
131+
Description: Stores the same MODALIAS value emitted by uevent for
132+
the XDomain service. Format: tbtsvc:kSpNvNrN
133+
134+
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcid
135+
Date: Jan 2018
136+
KernelVersion: 4.15
137+
Contact: [email protected]
138+
Description: This contains XDomain protocol identifier the XDomain
139+
service supports.
140+
141+
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcvers
142+
Date: Jan 2018
143+
KernelVersion: 4.15
144+
Contact: [email protected]
145+
Description: This contains XDomain protocol version the XDomain
146+
service supports.
147+
148+
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcrevs
149+
Date: Jan 2018
150+
KernelVersion: 4.15
151+
Contact: [email protected]
152+
Description: This contains XDomain software version the XDomain
153+
service supports.
154+
155+
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcstns
156+
Date: Jan 2018
157+
KernelVersion: 4.15
158+
Contact: [email protected]
159+
Description: This contains XDomain service specific settings as
160+
bitmask. Format: %x

‎Documentation/ABI/testing/sysfs-driver-w1_ds28e17

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/bus/w1/devices/19-<id>/speed
2+
Date: Sep 2017
3+
KernelVersion: 4.14
4+
Contact: Jan Kandziora <[email protected]>
5+
Description: When written, this file sets the I2C speed on the connected
6+
DS28E17 chip. When read, it reads the current setting from
7+
the DS28E17 chip.
8+
Valid values: 100, 400, 900 [kBaud].
9+
Default 100, can be set by w1_ds28e17.speed= module parameter.
10+
Users: w1_ds28e17 driver
11+
12+
What: /sys/bus/w1/devices/19-<id>/stretch
13+
Date: Sep 2017
14+
KernelVersion: 4.14
15+
Contact: Jan Kandziora <[email protected]>
16+
Description: When written, this file sets the multiplier used to calculate
17+
the busy timeout for I2C operations on the connected DS28E17
18+
chip. When read, returns the current setting.
19+
Valid values: 1 to 9.
20+
Default 1, can be set by w1_ds28e17.stretch= module parameter.
21+
Users: w1_ds28e17 driver

‎Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ Description:
5151
Controls the dirty page count condition for the in-place-update
5252
policies.
5353

54+
What: /sys/fs/f2fs/<disk>/min_hot_blocks
55+
Date: March 2017
56+
Contact: "Jaegeuk Kim" <[email protected]>
57+
Description:
58+
Controls the dirty page count condition for redefining hot data.
59+
60+
What: /sys/fs/f2fs/<disk>/min_ssr_sections
61+
Date: October 2017
62+
Contact: "Chao Yu" <[email protected]>
63+
Description:
64+
Controls the fee section threshold to trigger SSR allocation.
65+
5466
What: /sys/fs/f2fs/<disk>/max_small_discards
5567
Date: November 2013
5668
Contact: "Jaegeuk Kim" <[email protected]>
@@ -102,6 +114,12 @@ Contact: "Jaegeuk Kim" <[email protected]>
102114
Description:
103115
Controls the idle timing.
104116

117+
What: /sys/fs/f2fs/<disk>/iostat_enable
118+
Date: August 2017
119+
Contact: "Chao Yu" <[email protected]>
120+
Description:
121+
Controls to enable/disable IO stat.
122+
105123
What: /sys/fs/f2fs/<disk>/ra_nid_pages
106124
Date: October 2015
107125
Contact: "Chao Yu" <[email protected]>
@@ -122,6 +140,12 @@ Contact: "Shuoran Liu" <[email protected]>
122140
Description:
123141
Shows total written kbytes issued to disk.
124142

143+
What: /sys/fs/f2fs/<disk>/feature
144+
Date: July 2017
145+
Contact: "Jaegeuk Kim" <[email protected]>
146+
Description:
147+
Shows all enabled features in current device.
148+
125149
What: /sys/fs/f2fs/<disk>/inject_rate
126150
Date: May 2016
127151
Contact: "Sheng Yong" <[email protected]>
@@ -138,7 +162,18 @@ What: /sys/fs/f2fs/<disk>/reserved_blocks
138162
Date: June 2017
139163
Contact: "Chao Yu" <[email protected]>
140164
Description:
141-
Controls current reserved blocks in system.
165+
Controls target reserved blocks in system, the threshold
166+
is soft, it could exceed current available user space.
167+
168+
What: /sys/fs/f2fs/<disk>/current_reserved_blocks
169+
Date: October 2017
170+
Contact: "Yunlong Song" <[email protected]>
171+
Contact: "Chao Yu" <[email protected]>
172+
Description:
173+
Shows current reserved blocks in system, it may be temporarily
174+
smaller than target_reserved_blocks, but will gradually
175+
increase to target_reserved_blocks when more free blocks are
176+
freed by user later.
142177

143178
What: /sys/fs/f2fs/<disk>/gc_urgent
144179
Date: August 2017

‎Documentation/ABI/testing/sysfs-platform-dell-smbios

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/devices/platform/<platform>/tokens/*
2+
Date: November 2017
3+
KernelVersion: 4.15
4+
Contact: "Mario Limonciello" <[email protected]>
5+
Description:
6+
A read-only description of Dell platform tokens
7+
available on the machine.
8+
9+
Each token attribute is available as a pair of
10+
sysfs attributes readable by a process with
11+
CAP_SYS_ADMIN.
12+
13+
For example the token ID "5" would be available
14+
as the following attributes:
15+
16+
0005_location
17+
0005_value
18+
19+
Tokens will vary from machine to machine, and
20+
only tokens available on that machine will be
21+
displayed.

‎Documentation/ABI/testing/sysfs-platform-intel-wmi-thunderbolt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /sys/devices/platform/<platform>/force_power
2+
Date: September 2017
3+
KernelVersion: 4.15
4+
Contact: "Mario Limonciello" <[email protected]>
5+
Description:
6+
Modify the platform force power state, influencing
7+
Thunderbolt controllers to turn on or off when no
8+
devices are connected (write-only)
9+
There are two available states:
10+
* 0 -> Force power disabled
11+
* 1 -> Force power enabled

‎Documentation/IPMI.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ If you want the driver to put an event into the event log on a panic,
8181
enable the 'Generate a panic event to all BMCs on a panic' option. If
8282
you want the whole panic string put into the event log using OEM
8383
events, enable the 'Generate OEM events containing the panic string'
84-
option.
84+
option. You can also enable these dynamically by setting the module
85+
parameter named "panic_op" in the ipmi_msghandler module to "event"
86+
or "string". Setting that parameter to "none" disables this function.
8587

8688
Basic Design
8789
------------

‎Documentation/admin-guide/dynamic-debug-howto.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ shortcut for ``print_hex_dump(KERN_DEBUG)``.
1818

1919
For ``print_hex_dump_debug()``/``print_hex_dump_bytes()``, format string is
2020
its ``prefix_str`` argument, if it is constant string; or ``hexdump``
21-
in case ``prefix_str`` is build dynamically.
21+
in case ``prefix_str`` is built dynamically.
2222

2323
Dynamic debug has even more useful features:
2424

@@ -197,8 +197,8 @@ line
197197
line number matches the callsite line number exactly. A
198198
range of line numbers matches any callsite between the first
199199
and last line number inclusive. An empty first number means
200-
the first line in the file, an empty line number means the
201-
last number in the file. Examples::
200+
the first line in the file, an empty last line number means the
201+
last line number in the file. Examples::
202202

203203
line 1603 // exactly line 1603
204204
line 1600-1605 // the six lines from line 1600 to line 1605

0 commit comments

Comments
 (0)