Skip to content

Commit ddb9e13

Browse files
jgross1jgross1
committed
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
2 parents 3a485c2 + d8a5b80 commit ddb9e13

File tree

13,230 files changed

+628831
-305308
lines changed

Some content is hidden

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

13,230 files changed

+628831
-305308
lines changed

‎.gitignore

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,40 @@
77
# command after changing this file, to see if there are
88
# any tracked files which get ignored after the change.
99
#
10-
# Normal rules
10+
# Normal rules (sorted alphabetically)
1111
#
1212
.*
13+
*.a
14+
*.bin
15+
*.bz2
16+
*.c.[012]*.*
17+
*.dtb
18+
*.dtb.S
19+
*.dwo
20+
*.elf
21+
*.gcno
22+
*.gz
23+
*.i
24+
*.ko
25+
*.ll
26+
*.lst
27+
*.lz4
28+
*.lzma
29+
*.lzo
30+
*.mod.c
1331
*.o
1432
*.o.*
15-
*.a
33+
*.order
34+
*.patch
1635
*.s
17-
*.ko
1836
*.so
1937
*.so.dbg
20-
*.mod.c
21-
*.i
22-
*.lst
38+
*.su
2339
*.symtypes
24-
*.order
25-
*.elf
26-
*.bin
2740
*.tar
28-
*.gz
29-
*.bz2
30-
*.lzma
3141
*.xz
32-
*.lz4
33-
*.lzo
34-
*.patch
35-
*.gcno
36-
*.ll
37-
modules.builtin
3842
Module.symvers
39-
*.dwo
40-
*.su
41-
*.c.[012]*.*
43+
modules.builtin
4244

4345
#
4446
# Top-level generic files
@@ -53,6 +55,11 @@ Module.symvers
5355
/System.map
5456
/Module.markers
5557

58+
#
59+
# RPM spec file (make rpm-pkg)
60+
#
61+
/*.spec
62+
5663
#
5764
# Debian directory (make deb-pkg)
5865
#

‎.mailmap

Lines changed: 3 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]>
@@ -105,6 +107,7 @@ Linus Lüssing <[email protected]> <[email protected]>
105107
Maciej W. Rozycki <[email protected]> <[email protected]>
106108
Marcin Nowakowski <[email protected]> <[email protected]>
107109
Mark Brown <[email protected]>
110+
Mark Yao <[email protected]> <[email protected]>
108111
Martin Kepplinger <[email protected]> <[email protected]>
109112
Martin Kepplinger <[email protected]> <[email protected]>
110113
Matthieu CASTET <[email protected]>

‎Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Description:
1111
Kernel code may export it for complete or partial access.
1212

1313
GPIOs are identified as they are inside the kernel, using integers in
14-
the range 0..INT_MAX. See Documentation/gpio.txt for more information.
14+
the range 0..INT_MAX. See Documentation/gpio/gpio.txt for more information.
1515

1616
/sys/class/gpio
1717
/export ... asks the kernel to export a GPIO to userspace

‎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/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/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/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-iio

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ Description:
522522
Specifies the output powerdown mode.
523523
DAC output stage is disconnected from the amplifier and
524524
1kohm_to_gnd: connected to ground via an 1kOhm resistor,
525+
2.5kohm_to_gnd: connected to ground via a 2.5kOhm resistor,
525526
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
526527
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
527528
90kohm_to_gnd: connected to ground via a 90kOhm resistor,
@@ -1242,9 +1243,9 @@ What: /sys/.../iio:deviceX/in_distance_raw
12421243
KernelVersion: 4.0
12431244
Contact: [email protected]
12441245
Description:
1245-
This attribute is used to read the distance covered by the user
1246-
since the last reboot while activated. Units after application
1247-
of scale are meters.
1246+
This attribute is used to read the measured distance to an object
1247+
or the distance covered by the user since the last reboot while
1248+
activated. Units after application of scale are meters.
12481249

12491250
What: /sys/bus/iio/devices/iio:deviceX/store_eeprom
12501251
KernelVersion: 3.4.0

‎Documentation/ABI/testing/sysfs-bus-iio-cros-ec

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,13 @@ Description:
1616
the motion sensor is placed. For example, in a laptop a motion
1717
sensor can be located on the base or on the lid. Current valid
1818
values are 'base' and 'lid'.
19+
20+
What: /sys/bus/iio/devices/iio:deviceX/id
21+
Date: Septembre 2017
22+
KernelVersion: 4.14
23+
Contact: [email protected]
24+
Description:
25+
This attribute is exposed by the CrOS EC legacy accelerometer
26+
driver and represents the sensor ID as exposed by the EC. This
27+
ID is used by the Android sensor service hardware abstraction
28+
layer (sensor HAL) through the Android container on ChromeOS.

‎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 <[email protected]>
4+
Description: Extended CSD revision number

‎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

0 commit comments

Comments
 (0)