Skip to content

Commit 4b77c32

Browse files
authored
Merge pull request torvalds#249 from libos-nuse/merge-linux-4.8
Merge linux 4.8
2 parents b371cee + ac0f65e commit 4b77c32

File tree

11,430 files changed

+653028
-304645
lines changed

Some content is hidden

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

11,430 files changed

+653028
-304645
lines changed

.cocciconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[spatch]
2+
options = --timeout 200
3+
options = --use-gitgrep

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ modules.builtin
3737
Module.symvers
3838
*.dwo
3939
*.su
40+
*.c.[012]*.*
4041

4142
#
4243
# Top-level generic files
@@ -66,6 +67,7 @@ Module.symvers
6667
#
6768
!.gitignore
6869
!.mailmap
70+
!.cocciconfig
6971

7072
#
7173
# Generated include files

.mailmap

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Aaron Durbin <[email protected]>
1111
Adam Oldham <[email protected]>
1212
Adam Radford <[email protected]>
1313
Adrian Bunk <[email protected]>
14+
1415
1516
1617
Aleksey Gorelov <[email protected]>
@@ -68,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)>
6869
James Bottomley <[email protected]>
6970
James E Wilson <[email protected]>
7071
James Ketrenos <jketreno@io.(none)>
72+
7173
7274
Jean Tourrilhes <[email protected]>
7375
Jeff Garzik <[email protected]>
@@ -87,13 +89,24 @@ Kay Sievers <[email protected]>
8789
Kenneth W Chen <[email protected]>
8890
Konstantin Khlebnikov <[email protected]> <[email protected]>
8991
92+
Krzysztof Kozlowski <[email protected]> <[email protected]>
9093
Krzysztof Kozlowski <[email protected]> <[email protected]>
9194
Kuninori Morimoto <[email protected]>
9295
Leonid I Ananiev <[email protected]>
9396
Linas Vepstas <[email protected]>
97+
98+
9499
Mark Brown <[email protected]>
95100
Matthieu CASTET <[email protected]>
96-
101+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
102+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
103+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
104+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
105+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
106+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
107+
Mauro Carvalho Chehab <[email protected]> <[email protected]>
108+
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
109+
97110
Mayuresh Janorkar <[email protected]>
98111
Michael Buesch <[email protected]>
99112
Michel Dänzer <[email protected]>
@@ -127,7 +140,10 @@ Santosh Shilimkar <[email protected]>
127140
Sascha Hauer <[email protected]>
128141
S.Çağlar Onur <[email protected]>
129142
130-
143+
144+
145+
146+
131147
Simon Kelley <[email protected]>
132148
Stéphane Witzmann <[email protected]>
133149
Stephen Hemminger <[email protected]>
@@ -144,6 +160,8 @@ Valdis Kletnieks <[email protected]>
144160
145161
146162
163+
164+
147165
Takashi YOSHII <[email protected]>
148166
Yusuke Goda <[email protected]>
149167
Gustavo Padovan <[email protected]>

Documentation/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
output
2+
*.pyc

Documentation/00-INDEX

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ kbuild/
255255
- directory with info about the kernel build process.
256256
kdump/
257257
- directory with mini HowTo on getting the crash dump code to work.
258-
kernel-doc-nano-HOWTO.txt
259-
- mini HowTo on generation and location of kernel documentation files.
260258
kernel-docs.txt
261259
- listing of various WWW + books that document kernel internals.
260+
kernel-documentation.rst
261+
- how to write and format reStructuredText kernel documentation
262262
kernel-parameters.txt
263263
- summary listing of command line / boot prompt args for the kernel.
264264
kernel-per-CPU-kthreads.txt

Documentation/ABI/stable/sysfs-devices

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note: This documents additional properties of any device beyond what
22
# is documented in Documentation/sysfs-rules.txt
33

4-
What: /sys/devices/*/of_path
4+
What: /sys/devices/*/of_node
55
Date: February 2015
66
Contact: Device Tree mailing list <[email protected]>
77
Description:
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
What: /config/acpi
2+
Date: July 2016
3+
KernelVersion: 4.8
4+
5+
Description:
6+
This represents the ACPI subsystem entry point directory. It
7+
contains sub-groups corresponding to ACPI configurable options.
8+
9+
What: /config/acpi/table
10+
Date: July 2016
11+
KernelVersion: 4.8
12+
Description:
13+
14+
This group contains the configuration for user defined ACPI
15+
tables. The attributes of a user define table are:
16+
17+
aml - a binary attribute that the user can use to
18+
fill in the ACPI aml definitions. Once the aml
19+
data is written to this file and the file is
20+
closed the table will be loaded and ACPI devices
21+
will be enumerated. To check if the operation is
22+
successful the user must check the error code
23+
for close(). If the operation is successful,
24+
subsequent writes to this attribute will fail.
25+
26+
The rest of the attributes are read-only and are valid only
27+
after the table has been loaded by filling the aml entry:
28+
29+
signature - ASCII table signature
30+
length - length of table in bytes, including the header
31+
revision - ACPI Specification minor version number
32+
oem_id - ASCII OEM identification
33+
oem_table_id - ASCII OEM table identification
34+
oem_revision - OEM revision number
35+
asl_compiler_id - ASCII ASL compiler vendor ID
36+
asl_compiler_revision - ASL compiler version

Documentation/ABI/testing/configfs-iio

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,16 @@ KernelVersion: 4.4
1919
Description:
2020
High resolution timers directory. Creating a directory here
2121
will result in creating a hrtimer trigger in the IIO subsystem.
22+
23+
What: /config/iio/devices
24+
Date: April 2016
25+
KernelVersion: 4.7
26+
Description:
27+
Industrial IO software devices directory.
28+
29+
What: /config/iio/devices/dummy
30+
Date: April 2016
31+
KernelVersion: 4.7
32+
Description:
33+
Dummy IIO devices directory. Creating a directory here will result
34+
in creating a dummy IIO device in the IIO subystem.

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ Description:
3232
Description of the physical chip / device for device X.
3333
Typically a part number.
3434

35+
What: /sys/bus/iio/devices/iio:deviceX/timestamp_clock
36+
KernelVersion: 4.5
37+
38+
Description:
39+
String identifying current posix clock used to timestamp
40+
buffered samples and events for device X.
41+
3542
What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency
3643
What: /sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency
3744
What: /sys/bus/iio/devices/triggerX/sampling_frequency
@@ -1565,3 +1572,10 @@ Description:
15651572
* X is in the plane of the propellers, perpendicular to Y axis,
15661573
and positive towards the starboard side of the UAV ;
15671574
* Z is perpendicular to propellers plane and positive upwards.
1575+
1576+
What: /sys/bus/iio/devices/iio:deviceX/in_electricalconductivity_raw
1577+
KernelVersion: 4.8
1578+
1579+
Description:
1580+
Raw (unscaled no offset etc.) electric conductivity reading that
1581+
can be processed to siemens per meter.
Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,41 @@
1-
What: /sys/bus/iio/devices/iio:deviceX/tia_resistanceY
2-
/sys/bus/iio/devices/iio:deviceX/tia_capacitanceY
3-
Date: December 2015
4-
KernelVersion:
5-
Contact: Andrew F. Davis <[email protected]>
6-
Description:
7-
Get and set the resistance and the capacitance settings for the
8-
Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for
9-
Rf2 and Cf2 values.
10-
11-
What: /sys/bus/iio/devices/iio:deviceX/tia_separate_en
12-
Date: December 2015
13-
KernelVersion:
14-
Contact: Andrew F. Davis <[email protected]>
15-
Description:
16-
Enable or disable separate settings for the TransImpedance
17-
Amplifier above, when disabled both values are set by the
18-
first channel.
19-
20-
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_raw
21-
/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw
22-
Date: December 2015
1+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_raw
2+
Date: May 2016
233
KernelVersion:
244
Contact: Andrew F. Davis <[email protected]>
255
Description:
266
Get measured values from the ADC for these stages. Y is the
27-
specific LED number. The values are expressed in 24-bit twos
28-
complement.
7+
specific stage number corresponding to datasheet stage names
8+
as follows:
9+
1 -> LED2
10+
2 -> ALED2/LED3
11+
3 -> LED1
12+
4 -> ALED1/LED4
13+
Note that channels 5 and 6 represent LED2-ALED2 and LED1-ALED1
14+
respectively which simply helper channels containing the
15+
calculated difference in the value of stage 1 - 2 and 3 - 4.
16+
The values are expressed in 24-bit twos complement.
2917

30-
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw
31-
Date: December 2015
18+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_offset
19+
Date: May 2016
3220
KernelVersion:
3321
Contact: Andrew F. Davis <[email protected]>
3422
Description:
35-
Get differential values from the ADC for these stages. Y is the
36-
specific LED number. The values are expressed in 24-bit twos
37-
complement for the specified LEDs.
23+
Get and set the offset cancellation DAC setting for these
24+
stages. The values are expressed in 5-bit sign-magnitude.
3825

39-
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_offset
40-
/sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset
41-
Date: December 2015
26+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_resistance
27+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_capacitance
28+
Date: May 2016
4229
KernelVersion:
4330
Contact: Andrew F. Davis <[email protected]>
4431
Description:
45-
Get and set the offset cancellation DAC setting for these
46-
stages. The values are expressed in 5-bit sign-magnitude.
32+
Get and set the resistance and the capacitance settings for the
33+
Transimpedance Amplifier during the associated stage.
4734

48-
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_raw
49-
Date: December 2015
35+
What: /sys/bus/iio/devices/iio:deviceX/out_currentY_raw
36+
Date: May 2016
5037
KernelVersion:
5138
Contact: Andrew F. Davis <[email protected]>
5239
Description:
53-
Get and set the LED current for the specified LED. Y is the
54-
specific LED number.
40+
Get and set the LED current for the specified LED active during
41+
this stage. Y is the specific stage number.
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11

2-
What: /sys/class/net/<iface>/batman-adv/throughput_override
3-
Date: Feb 2014
4-
Contact: Antonio Quartulli <[email protected]>
5-
description:
6-
Defines the throughput value to be used by B.A.T.M.A.N. V
7-
when estimating the link throughput using this interface.
8-
If the value is set to 0 then batman-adv will try to
9-
estimate the throughput by itself.
10-
112
What: /sys/class/net/<iface>/batman-adv/elp_interval
123
Date: Feb 2014
134
Contact: Linus Lüssing <[email protected]>
145
Description:
156
Defines the interval in milliseconds in which batman
16-
sends its probing packets for link quality measurements.
7+
emits probing packets for neighbor sensing (ELP).
178

189
What: /sys/class/net/<iface>/batman-adv/iface_status
1910
Date: May 2010
@@ -28,3 +19,12 @@ Description:
2819
The /sys/class/net/<iface>/batman-adv/mesh_iface file
2920
displays the batman mesh interface this <iface>
3021
currently is associated with.
22+
23+
What: /sys/class/net/<iface>/batman-adv/throughput_override
24+
Date: Feb 2014
25+
Contact: Antonio Quartulli <[email protected]>
26+
description:
27+
Defines the throughput value to be used by B.A.T.M.A.N. V
28+
when estimating the link throughput using this interface.
29+
If the value is set to 0 then batman-adv will try to
30+
estimate the throughput by itself.

Documentation/ABI/testing/sysfs-class-pwm

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,12 @@ Description:
7777
Enable/disable the PWM signal.
7878
0 is disabled
7979
1 is enabled
80+
81+
What: /sys/class/pwm/pwmchipN/pwmX/capture
82+
Date: June 2016
83+
KernelVersion: 4.8
84+
Contact: Lee Jones <[email protected]>
85+
Description:
86+
Capture information about a PWM signal. The output format is a
87+
pair unsigned integers (period and duty cycle), separated by a
88+
single space.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,3 +340,13 @@ Description: POWERNV CPUFreq driver's frequency throttle stats directory and
340340
'policyX/throttle_stats' directory and all the attributes are same as
341341
the /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats directory and
342342
attributes which give the frequency throttle information of the chip.
343+
344+
What: /sys/devices/system/cpu/cpuX/regs/
345+
/sys/devices/system/cpu/cpuX/regs/identification/
346+
/sys/devices/system/cpu/cpuX/regs/identification/midr_el1
347+
/sys/devices/system/cpu/cpuX/regs/identification/revidr_el1
348+
Date: June 2016
349+
Contact: Linux ARM Kernel Mailing list <[email protected]>
350+
Description: AArch64 CPU registers
351+
'identification' directory exposes the CPU ID registers for
352+
identifying model and revision of the CPU.

Documentation/CodingStyle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ of the function, telling people what it does, and possibly WHY it does
458458
it.
459459

460460
When commenting the kernel API functions, please use the kernel-doc format.
461-
See the files Documentation/kernel-doc-nano-HOWTO.txt and scripts/kernel-doc
461+
See the files Documentation/kernel-documentation.rst and scripts/kernel-doc
462462
for details.
463463

464464
Linux style for comments is the C89 "/* ... */" style.

0 commit comments

Comments
 (0)