Skip to content

Commit 3d886aa

Browse files
dledforddledford
committed
Merge tag 'v4.13-rc1' into k.o/for-4.13-rc
Linux v4.13-rc1
2 parents b6ea01b + 5771a8c commit 3d886aa

File tree

10,513 files changed

+833020
-237954
lines changed

Some content is hidden

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

10,513 files changed

+833020
-237954
lines changed

‎Documentation/00-INDEX

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ DMA-ISA-LPC.txt
2424
- How to do DMA with ISA (and LPC) devices.
2525
DMA-attributes.txt
2626
- listing of the various possible attributes a DMA region can have
27-
DocBook/
28-
- directory with DocBook templates etc. for kernel documentation.
2927
EDID/
3028
- directory with info on customizing EDID for broken gfx/displays.
3129
IPMI.txt
@@ -40,8 +38,6 @@ Intel-IOMMU.txt
4038
- basic info on the Intel IOMMU virtualization support.
4139
Makefile
4240
- It's not of interest for those who aren't touching the build system.
43-
Makefile.sphinx
44-
- It's not of interest for those who aren't touching the build system.
4541
PCI/
4642
- info related to PCI drivers.
4743
RCU/
@@ -246,8 +242,6 @@ kprobes.txt
246242
- documents the kernel probes debugging feature.
247243
kref.txt
248244
- docs on adding reference counters (krefs) to kernel objects.
249-
kselftest.txt
250-
- small unittests for (some) individual codepaths in the kernel.
251245
laptops/
252246
- directory with laptop related info and laptop driver documentation.
253247
ldm.txt
@@ -264,6 +258,8 @@ logo.gif
264258
- full colour GIF image of Linux logo (penguin - Tux).
265259
logo.txt
266260
- info on creator of above logo & site to get additional images from.
261+
lsm.txt
262+
- Linux Security Modules: General Security Hooks for Linux
267263
lzo.txt
268264
- kernel LZO decompressor input formats
269265
m68k/

‎Documentation/ABI/stable/sysfs-class-udc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ Description:
5555
Indicates the maximum USB speed supported by this port.
5656
Users:
5757

58-
What: /sys/class/udc/<udc>/maximum_speed
59-
Date: June 2011
60-
KernelVersion: 3.1
61-
Contact: Felipe Balbi <[email protected]>
62-
Description:
63-
Indicates the maximum USB speed supported by this port.
64-
Users:
65-
6658
What: /sys/class/udc/<udc>/soft_connect
6759
Date: June 2011
6860
KernelVersion: 3.1
@@ -91,3 +83,11 @@ Description:
9183
'configured', and 'suspended'; however not all USB Device
9284
Controllers support reporting all states.
9385
Users:
86+
87+
What: /sys/class/udc/<udc>/function
88+
Date: June 2017
89+
KernelVersion: 4.13
90+
Contact: Felipe Balbi <[email protected]>
91+
Description:
92+
Prints out name of currently running USB Gadget Driver.
93+
Users:

‎Documentation/ABI/stable/sysfs-driver-aspeed-vuart

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/platform/drivers/aspeed-vuart/*/lpc_address
2+
Date: April 2017
3+
Contact: Jeremy Kerr <[email protected]>
4+
Description: Configures which IO port the host side of the UART
5+
will appear on the host <-> BMC LPC bus.
6+
Users: OpenBMC. Proposed changes should be mailed to
7+
[email protected]
8+
9+
What: /sys/bus/platform/drivers/aspeed-vuart*/sirq
10+
Date: April 2017
11+
Contact: Jeremy Kerr <[email protected]>
12+
Description: Configures which interrupt number the host side of
13+
the UART will appear on the host <-> BMC LPC bus.
14+
Users: OpenBMC. Proposed changes should be mailed to
15+
[email protected]

‎Documentation/ABI/stable/sysfs-hypervisor-xen

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
What: /sys/hypervisor/compilation/compile_date
2+
Date: March 2009
3+
KernelVersion: 2.6.30
4+
Contact: [email protected]
5+
Description: If running under Xen:
6+
Contains the build time stamp of the Xen hypervisor
7+
Might return "<denied>" in case of special security settings
8+
in the hypervisor.
9+
10+
What: /sys/hypervisor/compilation/compiled_by
11+
Date: March 2009
12+
KernelVersion: 2.6.30
13+
Contact: [email protected]
14+
Description: If running under Xen:
15+
Contains information who built the Xen hypervisor
16+
Might return "<denied>" in case of special security settings
17+
in the hypervisor.
18+
19+
What: /sys/hypervisor/compilation/compiler
20+
Date: March 2009
21+
KernelVersion: 2.6.30
22+
Contact: [email protected]
23+
Description: If running under Xen:
24+
Compiler which was used to build the Xen hypervisor
25+
Might return "<denied>" in case of special security settings
26+
in the hypervisor.
27+
28+
What: /sys/hypervisor/properties/capabilities
29+
Date: March 2009
30+
KernelVersion: 2.6.30
31+
Contact: [email protected]
32+
Description: If running under Xen:
33+
Space separated list of supported guest system types. Each type
34+
is in the format: <class>-<major>.<minor>-<arch>
35+
With:
36+
<class>: "xen" -- x86: paravirtualized, arm: standard
37+
"hvm" -- x86 only: fully virtualized
38+
<major>: major guest interface version
39+
<minor>: minor guest interface version
40+
<arch>: architecture, e.g.:
41+
"x86_32": 32 bit x86 guest without PAE
42+
"x86_32p": 32 bit x86 guest with PAE
43+
"x86_64": 64 bit x86 guest
44+
"armv7l": 32 bit arm guest
45+
"aarch64": 64 bit arm guest
46+
47+
What: /sys/hypervisor/properties/changeset
48+
Date: March 2009
49+
KernelVersion: 2.6.30
50+
Contact: [email protected]
51+
Description: If running under Xen:
52+
Changeset of the hypervisor (git commit)
53+
Might return "<denied>" in case of special security settings
54+
in the hypervisor.
55+
56+
What: /sys/hypervisor/properties/features
57+
Date: March 2009
58+
KernelVersion: 2.6.30
59+
Contact: [email protected]
60+
Description: If running under Xen:
61+
Features the Xen hypervisor supports for the guest as defined
62+
in include/xen/interface/features.h printed as a hex value.
63+
64+
What: /sys/hypervisor/properties/pagesize
65+
Date: March 2009
66+
KernelVersion: 2.6.30
67+
Contact: [email protected]
68+
Description: If running under Xen:
69+
Default page size of the hypervisor printed as a hex value.
70+
Might return "0" in case of special security settings
71+
in the hypervisor.
72+
73+
What: /sys/hypervisor/properties/virtual_start
74+
Date: March 2009
75+
KernelVersion: 2.6.30
76+
Contact: [email protected]
77+
Description: If running under Xen:
78+
Virtual address of the hypervisor as a hex value.
79+
80+
What: /sys/hypervisor/type
81+
Date: March 2009
82+
KernelVersion: 2.6.30
83+
Contact: [email protected]
84+
Description: If running under Xen:
85+
Type of hypervisor:
86+
"xen": Xen hypervisor
87+
88+
What: /sys/hypervisor/uuid
89+
Date: March 2009
90+
KernelVersion: 2.6.30
91+
Contact: [email protected]
92+
Description: If running under Xen:
93+
UUID of the guest as known to the Xen hypervisor.
94+
95+
What: /sys/hypervisor/version/extra
96+
Date: March 2009
97+
KernelVersion: 2.6.30
98+
Contact: [email protected]
99+
Description: If running under Xen:
100+
The Xen version is in the format <major>.<minor><extra>
101+
This is the <extra> part of it.
102+
Might return "<denied>" in case of special security settings
103+
in the hypervisor.
104+
105+
What: /sys/hypervisor/version/major
106+
Date: March 2009
107+
KernelVersion: 2.6.30
108+
Contact: [email protected]
109+
Description: If running under Xen:
110+
The Xen version is in the format <major>.<minor><extra>
111+
This is the <major> part of it.
112+
113+
What: /sys/hypervisor/version/minor
114+
Date: March 2009
115+
KernelVersion: 2.6.30
116+
Contact: [email protected]
117+
Description: If running under Xen:
118+
The Xen version is in the format <major>.<minor><extra>
119+
This is the <minor> part of it.

‎Documentation/ABI/testing/configfs-usb-gadget-uac1

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
What: /config/usb-gadget/gadget/functions/uac1.name
2-
Date: Sep 2014
3-
KernelVersion: 3.18
2+
Date: June 2017
3+
KernelVersion: 4.14
44
Description:
55
The attributes:
66

7-
audio_buf_size - audio buffer size
8-
fn_cap - capture pcm device file name
9-
fn_cntl - control device file name
10-
fn_play - playback pcm device file name
11-
req_buf_size - ISO OUT endpoint request buffer size
12-
req_count - ISO OUT endpoint request count
7+
c_chmask - capture channel mask
8+
c_srate - capture sampling rate
9+
c_ssize - capture sample size (bytes)
10+
p_chmask - playback channel mask
11+
p_srate - playback sampling rate
12+
p_ssize - playback sample size (bytes)
13+
req_number - the number of pre-allocated request
14+
for both capture and playback

‎Documentation/ABI/testing/configfs-usb-gadget-uac1_legacy

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /config/usb-gadget/gadget/functions/uac1_legacy.name
2+
Date: Sep 2014
3+
KernelVersion: 3.18
4+
Description:
5+
The attributes:
6+
7+
audio_buf_size - audio buffer size
8+
fn_cap - capture pcm device file name
9+
fn_cntl - control device file name
10+
fn_play - playback pcm device file name
11+
req_buf_size - ISO OUT endpoint request buffer size
12+
req_count - ISO OUT endpoint request count

‎Documentation/ABI/testing/ima_policy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ Description:
3434
fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
3535
uid:= decimal value
3636
euid:= decimal value
37-
fowner:=decimal value
37+
fowner:= decimal value
3838
lsm: are LSM specific
3939
option: appraise_type:= [imasig]
40+
pcr:= decimal value
4041

4142
default policy:
4243
# PROC_SUPER_MAGIC
@@ -96,3 +97,8 @@ Description:
9697

9798
Smack:
9899
measure subj_user=_ func=FILE_CHECK mask=MAY_READ
100+
101+
Example of measure rules using alternate PCRs:
102+
103+
measure func=KEXEC_KERNEL_CHECK pcr=4
104+
measure func=KEXEC_INITRAMFS_CHECK pcr=5

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
What: /sys/bus/platform/devices/fsi-master/rescan
2+
Date: May 2017
3+
KernelVersion: 4.12
4+
Contact: [email protected]
5+
Description:
6+
Initiates a FSI master scan for all connected slave devices
7+
on its links.
8+
9+
What: /sys/bus/platform/devices/fsi-master/break
10+
Date: May 2017
11+
KernelVersion: 4.12
12+
Contact: [email protected]
13+
Description:
14+
Sends an FSI BREAK command on a master's communication
15+
link to any connnected slaves. A BREAK resets connected
16+
device's logic and preps it to receive further commands
17+
from the master.
18+
19+
What: /sys/bus/platform/devices/fsi-master/slave@00:00/term
20+
Date: May 2017
21+
KernelVersion: 4.12
22+
Contact: [email protected]
23+
Description:
24+
Sends an FSI terminate command from the master to its
25+
connected slave. A terminate resets the slave's state machines
26+
that control access to the internally connected engines. In
27+
addition the slave freezes its internal error register for
28+
debugging purposes. This command is also needed to abort any
29+
ongoing operation in case of an expired 'Master Time Out'
30+
timer.
31+
32+
What: /sys/bus/platform/devices/fsi-master/slave@00:00/raw
33+
Date: May 2017
34+
KernelVersion: 4.12
35+
Contact: [email protected]
36+
Description:
37+
Provides a means of reading/writing a 32 bit value from/to a
38+
specified FSI bus address.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,6 +1425,17 @@ Description:
14251425
guarantees that the hardware fifo is flushed to the device
14261426
buffer.
14271427

1428+
What: /sys/bus/iio/devices/iio:device*/buffer/hwfifo_timeout
1429+
KernelVersion: 4.12
1430+
Contact: [email protected]
1431+
Description:
1432+
A read/write property to provide capability to delay reporting of
1433+
samples till a timeout is reached. This allows host processors to
1434+
sleep, while the sensor is storing samples in its internal fifo.
1435+
The maximum timeout in seconds can be specified by setting
1436+
hwfifo_timeout.The current delay can be read by reading
1437+
hwfifo_timeout. A value of 0 means that there is no timeout.
1438+
14281439
What: /sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark
14291440
KernelVersion: 4.2
14301441
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-bus-iio-meas-spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ Description:
55
Reading returns either '1' or '0'. '1' means that the
66
battery level supplied to sensor is below 2.25V.
77
This ABI is available for tsys02d, htu21, ms8607
8-
This ABI is available for htu21, ms8607

‎Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,54 @@ Description:
1616
- "OC2REF" : OC2REF signal is used as trigger output.
1717
- "OC3REF" : OC3REF signal is used as trigger output.
1818
- "OC4REF" : OC4REF signal is used as trigger output.
19+
Additional modes (on TRGO2 only):
20+
- "OC5REF" : OC5REF signal is used as trigger output.
21+
- "OC6REF" : OC6REF signal is used as trigger output.
22+
- "compare_pulse_OC4REF":
23+
OC4REF rising or falling edges generate pulses.
24+
- "compare_pulse_OC6REF":
25+
OC6REF rising or falling edges generate pulses.
26+
- "compare_pulse_OC4REF_r_or_OC6REF_r":
27+
OC4REF or OC6REF rising edges generate pulses.
28+
- "compare_pulse_OC4REF_r_or_OC6REF_f":
29+
OC4REF rising or OC6REF falling edges generate pulses.
30+
- "compare_pulse_OC5REF_r_or_OC6REF_r":
31+
OC5REF or OC6REF rising edges generate pulses.
32+
- "compare_pulse_OC5REF_r_or_OC6REF_f":
33+
OC5REF rising or OC6REF falling edges generate pulses.
34+
35+
+-----------+ +-------------+ +---------+
36+
| Prescaler +-> | Counter | +-> | Master | TRGO(2)
37+
+-----------+ +--+--------+-+ |-> | Control +-->
38+
| | || +---------+
39+
+--v--------+-+ OCxREF || +---------+
40+
| Chx compare +----------> | Output | ChX
41+
+-----------+-+ | | Control +-->
42+
. | | +---------+
43+
. | | .
44+
+-----------v-+ OC6REF | .
45+
| Ch6 compare +---------+>
46+
+-------------+
47+
48+
Example with: "compare_pulse_OC4REF_r_or_OC6REF_r":
49+
50+
X
51+
X X
52+
X . . X
53+
X . . X
54+
X . . X
55+
count X . . . . X
56+
. . . .
57+
. . . .
58+
+---------------+
59+
OC4REF | . . |
60+
+-+ . . +-+
61+
. +---+ .
62+
OC6REF . | | .
63+
+-------+ +-------+
64+
+-+ +-+
65+
TRGO2 | | | |
66+
+-+ +---+ +---------+
1967

2068
What: /sys/bus/iio/devices/triggerX/master_mode
2169
KernelVersion: 4.11
@@ -90,3 +138,18 @@ Description:
90138
Counting is enabled on rising edge of the connected
91139
trigger, and remains enabled for the duration of this
92140
selected mode.
141+
142+
What: /sys/bus/iio/devices/iio:deviceX/in_count_trigger_mode_available
143+
KernelVersion: 4.13
144+
Contact: [email protected]
145+
Description:
146+
Reading returns the list possible trigger modes.
147+
148+
What: /sys/bus/iio/devices/iio:deviceX/in_count0_trigger_mode
149+
KernelVersion: 4.13
150+
Contact: [email protected]
151+
Description:
152+
Configure the device counter trigger mode
153+
counting direction is set by in_count0_count_direction
154+
attribute and the counter is clocked by the connected trigger
155+
rising edges.

0 commit comments

Comments
 (0)