Skip to content

Commit 3a485c2

Browse files
committed
Merge tag 'v4.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Linux 4.14
2 parents 569dbb8 + bebc608 commit 3a485c2

File tree

23,218 files changed

+635640
-361363
lines changed

Some content is hidden

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

23,218 files changed

+635640
-361363
lines changed

.mailmap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Adriana Reus <[email protected]> <[email protected]>
1515
1616
1717
Aleksey Gorelov <[email protected]>
18+
Aleksandar Markovic <[email protected]> <[email protected]>
1819
1920
2021
Andreas Herrmann <[email protected]>
@@ -43,6 +44,7 @@ Corey Minyard <[email protected]>
4344
Damian Hobson-Garcia <[email protected]>
4445
David Brownell <[email protected]>
4546
David Woodhouse <[email protected]>
47+
4648
Dmitry Eremin-Solenikov <[email protected]>
4749
Domen Puncer <[email protected]>
4850
Douglas Gilbert <[email protected]>
@@ -68,6 +70,8 @@ Jacob Shin <[email protected]>
6870
James Bottomley <jejb@mulgrave.(none)>
6971
James Bottomley <[email protected]>
7072
James E Wilson <[email protected]>
73+
74+
7175
James Ketrenos <jketreno@io.(none)>
7276
7377
@@ -98,6 +102,8 @@ Leonid I Ananiev <[email protected]>
98102
Linas Vepstas <[email protected]>
99103
100104
105+
106+
101107
Mark Brown <[email protected]>
102108
103109
@@ -112,9 +118,11 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
112118
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
113119
114120
121+
115122
Mayuresh Janorkar <[email protected]>
116123
Michael Buesch <[email protected]>
117124
Michel Dänzer <[email protected]>
125+
118126
Mitesh shah <[email protected]>
119127
120128
Morten Welinder <[email protected]>
@@ -125,6 +133,7 @@ Mythri P K <[email protected]>
125133
Nguyen Anh Quynh <[email protected]>
126134
Paolo 'Blaisorblade' Giarrusso <[email protected]>
127135
Patrick Mochel <[email protected]>
136+
128137
Peter A Jonsson <[email protected]>
129138
Peter Oruba <[email protected]>
130139
Peter Oruba <[email protected]>

CREDITS

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,7 +2090,7 @@ S: Kuala Lumpur, Malaysia
20902090

20912091
N: Mohit Kumar
20922092
D: ST Microelectronics SPEAr13xx PCI host bridge driver
2093-
D: Synopsys Designware PCI host bridge driver
2093+
D: Synopsys DesignWare PCI host bridge driver
20942094

20952095
N: Gabor Kuti
20962096
@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23
21132113
S: NL-5216 GP 's-Hertogenbosch
21142114
S: The Netherlands
21152115

2116+
N: Ashley Lai
2117+
2118+
D: IBM VTPM driver
2119+
21162120
N: Savio Lam
21172121
21182122
D: Author of the dialog utility, foundation
@@ -2606,11 +2610,9 @@ E: [email protected]
26062610
D: bug fixes, documentation, minor hackery
26072611

26082612
N: Paul Moore
2609-
2610-
D: NetLabel author
2611-
S: Hewlett-Packard
2612-
S: 110 Spit Brook Road
2613-
S: Nashua, NH 03062
2613+
2614+
W: http://www.paul-moore.com
2615+
D: NetLabel, SELinux, audit
26142616

26152617
N: James Morris
26162618
@@ -3335,6 +3337,10 @@ S: Braunschweiger Strasse 79
33353337
S: 31134 Hildesheim
33363338
S: Germany
33373339

3340+
N: Marcel Selhorst
3341+
3342+
D: TPM driver
3343+
33383344
N: Darren Senn
33393345
33403346
D: Whatever I notice needs doing (so far: itimers, /proc)
@@ -4130,7 +4136,6 @@ D: MD driver
41304136
D: EISA/sysfs subsystem
41314137
S: France
41324138

4133-
41344139
# Don't add your name here, unless you really _are_ after Marc
41354140
# alphabetically. Leonard used to be very proud of being the
41364141
# last entry, and he'll get positively pissed if he can't even
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/bus/nvmem/devices/.../nvmem
2+
Date: July 2015
3+
KernelVersion: 4.2
4+
Contact: Srinivas Kandagatla <[email protected]>
5+
Description:
6+
This file allows user to read/write the raw NVMEM contents.
7+
Permissions for write to this file depends on the nvmem
8+
provider configuration.
9+
10+
ex:
11+
hexdump /sys/bus/nvmem/devices/qfprom0/nvmem
12+
13+
0000000 0000 0000 0000 0000 0000 0000 0000 0000
14+
*
15+
00000a0 db10 2240 0000 e000 0c00 0c00 0000 0c00
16+
0000000 0000 0000 0000 0000 0000 0000 0000 0000
17+
...
18+
*
19+
0001000
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
2+
Date: December 3, 2009
3+
KernelVersion: 2.6.32
4+
5+
Description: Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,
6+
DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.
7+
8+
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
9+
Date: December 3, 2009
10+
KernelVersion: 2.6.32
11+
12+
Description: The number of descriptors active in the ring.
13+
14+
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
15+
Date: December 3, 2009
16+
KernelVersion: 2.6.32
17+
18+
Description: Descriptor ring size, total number of descriptors available.
19+
20+
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
21+
Date: December 3, 2009
22+
KernelVersion: 2.6.32
23+
24+
Description: Version of ioatdma device.
25+
26+
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
27+
Date: August 8, 2017
28+
KernelVersion: 4.14
29+
30+
Description: Tune-able interrupt delay value per channel basis.

Documentation/ABI/testing/configfs-usb-gadget-rndis

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ Description:
1212
Ethernet over USB link
1313
dev_addr - MAC address of device's end of this
1414
Ethernet over USB link
15+
class - USB interface class, default is 02 (hex)
16+
subclass - USB interface subclass, default is 06 (hex)
17+
protocol - USB interface protocol, default is 00 (hex)
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
What: /sys/kernel/debug/powerpc/memtrace
2+
Date: Aug 2017
3+
KernelVersion: 4.14
4+
5+
Description: This folder contains the relevant debugfs files for the
6+
hardware trace macro to use. CONFIG_PPC64_HARDWARE_TRACING
7+
must be set.
8+
9+
What: /sys/kernel/debug/powerpc/memtrace/enable
10+
Date: Aug 2017
11+
KernelVersion: 4.14
12+
13+
Description: Write an integer containing the size in bytes of the memory
14+
you want removed from each NUMA node to this file - it must be
15+
aligned to the memblock size. This amount of RAM will be removed
16+
from the kernel mappings and the following debugfs files will be
17+
created. This can only be successfully done once per boot. Once
18+
memory is successfully removed from each node, the following
19+
files are created.
20+
21+
What: /sys/kernel/debug/powerpc/memtrace/<node-id>
22+
Date: Aug 2017
23+
KernelVersion: 4.14
24+
25+
Description: This directory contains information about the removed memory
26+
from the specific NUMA node.
27+
28+
What: /sys/kernel/debug/powerpc/memtrace/<node-id>/size
29+
Date: Aug 2017
30+
KernelVersion: 4.14
31+
32+
Description: This contains the size of the memory removed from the node.
33+
34+
What: /sys/kernel/debug/powerpc/memtrace/<node-id>/start
35+
Date: Aug 2017
36+
KernelVersion: 4.14
37+
38+
Description: This contains the start address of the removed memory.
39+
40+
What: /sys/kernel/debug/powerpc/memtrace/<node-id>/trace
41+
Date: Aug 2017
42+
KernelVersion: 4.14
43+
44+
Description: This is where the hardware trace macro will output the trace
45+
it generates.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
What: /proc/pid/smaps_rollup
2+
Date: August 2017
3+
Contact: Daniel Colascione <[email protected]>
4+
Description:
5+
This file provides pre-summed memory information for a
6+
process. The format is identical to /proc/pid/smaps,
7+
except instead of an entry for each VMA in a process,
8+
smaps_rollup has a single entry (tagged "[rollup]")
9+
for which each field is the sum of the corresponding
10+
fields from all the maps in /proc/pid/smaps.
11+
For more details, see the procfs man page.
12+
13+
Typical output looks like this:
14+
15+
00100000-ff709000 ---p 00000000 00:00 0 [rollup]
16+
Rss: 884 kB
17+
Pss: 385 kB
18+
Shared_Clean: 696 kB
19+
Shared_Dirty: 0 kB
20+
Private_Clean: 120 kB
21+
Private_Dirty: 68 kB
22+
Referenced: 884 kB
23+
Anonymous: 68 kB
24+
LazyFree: 0 kB
25+
AnonHugePages: 0 kB
26+
ShmemPmdMapped: 0 kB
27+
Shared_Hugetlb: 0 kB
28+
Private_Hugetlb: 0 kB
29+
Swap: 0 kB
30+
SwapPss: 0 kB
31+
Locked: 385 kB

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,11 @@ Description:
9090
device's debugging info useful for kernel developers. Its
9191
format is not documented intentionally and may change
9292
anytime without any notice.
93+
94+
What: /sys/block/zram<id>/backing_dev
95+
Date: June 2017
96+
Contact: Minchan Kim <[email protected]>
97+
Description:
98+
The backing_dev file is read-write and set up backing
99+
device for zram to write incompressible pages.
100+
For using, user should enable CONFIG_ZRAM_WRITEBACK.

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ Description:
119119
unique to allow association with event codes. Units after
120120
application of scale and offset are milliamps.
121121

122+
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_raw
123+
KernelVersion: 4.5
124+
125+
Description:
126+
Raw (unscaled no bias removal etc.) power measurement from
127+
channel Y. The number must always be specified and
128+
unique to allow association with event codes. Units after
129+
application of scale and offset are milliwatts.
130+
122131
What: /sys/bus/iio/devices/iio:deviceX/in_capacitanceY_raw
123132
KernelVersion: 3.2
124133
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_count0_preset
2+
KernelVersion: 4.13
3+
4+
Description:
5+
Reading returns the current preset value. Writing sets the
6+
preset value. Encoder counts continuously from 0 to preset
7+
value, depending on direction (up/down).
8+
9+
What: /sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
10+
KernelVersion: 4.13
11+
12+
Description:
13+
Reading returns the list possible quadrature modes.
14+
15+
What: /sys/bus/iio/devices/iio:deviceX/in_count0_quadrature_mode
16+
KernelVersion: 4.13
17+
18+
Description:
19+
Configure the device counter quadrature modes:
20+
- non-quadrature:
21+
Encoder IN1 input servers as the count input (up
22+
direction).
23+
- quadrature:
24+
Encoder IN1 and IN2 inputs are mixed to get direction
25+
and count.
26+
27+
What: /sys/bus/iio/devices/iio:deviceX/in_count_polarity_available
28+
KernelVersion: 4.13
29+
30+
Description:
31+
Reading returns the list possible active edges.
32+
33+
What: /sys/bus/iio/devices/iio:deviceX/in_count0_polarity
34+
KernelVersion: 4.13
35+
36+
Description:
37+
Configure the device encoder/counter active edge:
38+
- rising-edge
39+
- falling-edge
40+
- both-edges
41+
42+
In non-quadrature mode, device counts up on active edge.
43+
In quadrature mode, encoder counting scenarios are as follows:
44+
----------------------------------------------------------------
45+
| Active | Level on | IN1 signal | IN2 signal |
46+
| edge | opposite |------------------------------------------
47+
| | signal | Rising | Falling | Rising | Falling |
48+
----------------------------------------------------------------
49+
| Rising | High -> | Down | - | Up | - |
50+
| edge | Low -> | Up | - | Down | - |
51+
----------------------------------------------------------------
52+
| Falling | High -> | - | Up | - | Down |
53+
| edge | Low -> | - | Down | - | Up |
54+
----------------------------------------------------------------
55+
| Both | High -> | Down | Up | Up | Down |
56+
| edges | Low -> | Up | Down | Down | Up |
57+
----------------------------------------------------------------

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,11 @@ Description:
1414
Show or set the gain boost of the amp, from 0-31 range.
1515
18 = indoors (default)
1616
14 = outdoors
17+
18+
What /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
19+
Date: May 2017
20+
KernelVersion: 4.13
21+
Contact: Matt Ranostay <[email protected]>
22+
Description:
23+
When 1 the noise level is over the trip level and not reporting
24+
valid data

Documentation/ABI/testing/sysfs-bus-thunderbolt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ Contact: [email protected]
4545
Description: When a devices supports Thunderbolt secure connect it will
4646
have this attribute. Writing 32 byte hex string changes
4747
authorization to use the secure connection method instead.
48+
Writing an empty string clears the key and regular connection
49+
method can be used again.
4850

4951
What: /sys/bus/thunderbolt/devices/.../device
5052
Date: Sep 2017

Documentation/ABI/testing/sysfs-bus-usb-lvstest

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,16 @@ Contact: Pratyush Anand <[email protected]>
4545
Description:
4646
Write to this node to issue "U3 exit" for Link Layer
4747
Validation device. It is needed for TD.7.36.
48+
49+
What: /sys/bus/usb/devices/.../enable_compliance
50+
Date: July 2017
51+
Description:
52+
Write to this node to set the port to compliance mode to test
53+
with Link Layer Validation device. It is needed for TD.7.34.
54+
55+
What: /sys/bus/usb/devices/.../warm_reset
56+
Date: July 2017
57+
Description:
58+
Write to this node to issue "Warm Reset" for Link Layer Validation
59+
device. It may be needed to properly reset an xHCI 1.1 host port if
60+
compliance mode needed to be explicitly enabled.

Documentation/ABI/testing/sysfs-class-remoteproc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/class/remoteproc/.../firmware
22
Date: October 2016
3-
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
3+
Contact: Matt Redfearn <matt.redfearn@mips.com>
44
Description: Remote processor firmware
55

66
Reports the name of the firmware currently loaded to the
@@ -11,7 +11,7 @@ Description: Remote processor firmware
1111

1212
What: /sys/class/remoteproc/.../state
1313
Date: October 2016
14-
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
14+
Contact: Matt Redfearn <matt.redfearn@mips.com>
1515
Description: Remote processor state
1616

1717
Reports the state of the remote processor, which will be one of:
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/bus/pci/drivers/altera-cvp/chkcfg
2+
Date: May 2017
3+
Kernel Version: 4.13
4+
Contact: Anatolij Gustschin <[email protected]>
5+
Description:
6+
Contains either 1 or 0 and controls if configuration
7+
error checking in altera-cvp driver is turned on or
8+
off.

0 commit comments

Comments
 (0)