Skip to content

Commit e24bce8

Browse files
tmlindtmlind
committed
Merge tag 'v4.11-rc1' into omap-for-v4.11/fixes
Linux 4.11-rc1
2 parents b92675d + c1ae3cf commit e24bce8

File tree

11,886 files changed

+516995
-232390
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,886 files changed

+516995
-232390
lines changed

‎Documentation/00-INDEX

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ m68k/
270270
- directory with info about Linux on Motorola 68k architecture.
271271
mailbox.txt
272272
- How to write drivers for the common mailbox framework (IPC).
273-
md-cluster.txt
274-
- info on shared-device RAID MD cluster.
273+
md/
274+
- directory with info about Linux Software RAID
275275
media/
276276
- info on media drivers: uAPI, kAPI and driver documentation.
277277
memory-barriers.txt

‎Documentation/ABI/obsolete/sysfs-block-zram

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

‎Documentation/ABI/testing/configfs-rdma_cm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,11 @@ Description: RDMA-CM based connections from HCA <hca> at port <port-num>
2020
will be initiated with this RoCE type as default.
2121
The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
2222
This parameter has RW access.
23+
24+
What: /config/rdma_cm/<hca>/ports/<port-num>/default_roce_tos
25+
Date: February 7, 2017
26+
KernelVersion: 4.11.0
27+
Description: RDMA-CM QPs from HCA <hca> at port <port-num>
28+
will be created with this TOS as default.
29+
This can be overridden by using the rdma_set_option API.
30+
The possible RoCE TOS values are 0-255.

‎Documentation/ABI/testing/sysfs-block-zram

Lines changed: 8 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -22,41 +22,6 @@ Description:
2222
device. The reset operation frees all the memory associated
2323
with this device.
2424

25-
What: /sys/block/zram<id>/num_reads
26-
Date: August 2010
27-
Contact: Nitin Gupta <ngupta@vflare.org>
28-
Description:
29-
The num_reads file is read-only and specifies the number of
30-
reads (failed or successful) done on this device.
31-
32-
What: /sys/block/zram<id>/num_writes
33-
Date: August 2010
34-
Contact: Nitin Gupta <ngupta@vflare.org>
35-
Description:
36-
The num_writes file is read-only and specifies the number of
37-
writes (failed or successful) done on this device.
38-
39-
What: /sys/block/zram<id>/invalid_io
40-
Date: August 2010
41-
Contact: Nitin Gupta <ngupta@vflare.org>
42-
Description:
43-
The invalid_io file is read-only and specifies the number of
44-
non-page-size-aligned I/O requests issued to this device.
45-
46-
What: /sys/block/zram<id>/failed_reads
47-
Date: February 2014
48-
Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
49-
Description:
50-
The failed_reads file is read-only and specifies the number of
51-
failed reads happened on this device.
52-
53-
What: /sys/block/zram<id>/failed_writes
54-
Date: February 2014
55-
Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
56-
Description:
57-
The failed_writes file is read-only and specifies the number of
58-
failed writes happened on this device.
59-
6025
What: /sys/block/zram<id>/max_comp_streams
6126
Date: February 2014
6227
Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
@@ -73,74 +38,24 @@ Description:
7338
available and selected compression algorithms, change
7439
compression algorithm selection.
7540

76-
What: /sys/block/zram<id>/notify_free
77-
Date: August 2010
78-
Contact: Nitin Gupta <ngupta@vflare.org>
79-
Description:
80-
The notify_free file is read-only. Depending on device usage
81-
scenario it may account a) the number of pages freed because
82-
of swap slot free notifications or b) the number of pages freed
83-
because of REQ_DISCARD requests sent by bio. The former ones
84-
are sent to a swap block device when a swap slot is freed, which
85-
implies that this disk is being used as a swap disk. The latter
86-
ones are sent by filesystem mounted with discard option,
87-
whenever some data blocks are getting discarded.
88-
89-
What: /sys/block/zram<id>/zero_pages
90-
Date: August 2010
91-
Contact: Nitin Gupta <ngupta@vflare.org>
92-
Description:
93-
The zero_pages file is read-only and specifies number of zero
94-
filled pages written to this disk. No memory is allocated for
95-
such pages.
96-
97-
What: /sys/block/zram<id>/orig_data_size
98-
Date: August 2010
99-
Contact: Nitin Gupta <ngupta@vflare.org>
100-
Description:
101-
The orig_data_size file is read-only and specifies uncompressed
102-
size of data stored in this disk. This excludes zero-filled
103-
pages (zero_pages) since no memory is allocated for them.
104-
Unit: bytes
105-
106-
What: /sys/block/zram<id>/compr_data_size
107-
Date: August 2010
108-
Contact: Nitin Gupta <ngupta@vflare.org>
109-
Description:
110-
The compr_data_size file is read-only and specifies compressed
111-
size of data stored in this disk. So, compression ratio can be
112-
calculated using orig_data_size and this statistic.
113-
Unit: bytes
114-
115-
What: /sys/block/zram<id>/mem_used_total
116-
Date: August 2010
117-
Contact: Nitin Gupta <ngupta@vflare.org>
118-
Description:
119-
The mem_used_total file is read-only and specifies the amount
120-
of memory, including allocator fragmentation and metadata
121-
overhead, allocated for this disk. So, allocator space
122-
efficiency can be calculated using compr_data_size and this
123-
statistic.
124-
Unit: bytes
125-
12641
What: /sys/block/zram<id>/mem_used_max
12742
Date: August 2014
12843
Contact: Minchan Kim <minchan@kernel.org>
12944
Description:
130-
The mem_used_max file is read/write and specifies the amount
131-
of maximum memory zram have consumed to store compressed data.
132-
For resetting the value, you should write "0". Otherwise,
133-
you could see -EINVAL.
45+
The mem_used_max file is write-only and is used to reset
46+
the counter of maximum memory zram have consumed to store
47+
compressed data. For resetting the value, you should write
48+
"0". Otherwise, you could see -EINVAL.
13449
Unit: bytes
13550

13651
What: /sys/block/zram<id>/mem_limit
13752
Date: August 2014
13853
Contact: Minchan Kim <minchan@kernel.org>
13954
Description:
140-
The mem_limit file is read/write and specifies the maximum
141-
amount of memory ZRAM can use to store the compressed data. The
142-
limit could be changed in run time and "0" means disable the
143-
limit. No limit is the initial state. Unit: bytes
55+
The mem_limit file is write-only and specifies the maximum
56+
amount of memory ZRAM can use to store the compressed data.
57+
The limit could be changed in run time and "0" means disable
58+
the limit. No limit is the initial state. Unit: bytes
14459

14560
What: /sys/block/zram<id>/compact
14661
Date: August 2015

‎Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/bus/i2c/devices/.../trickle_charge_bypass
2+
Date: Jan 2017
3+
KernelVersion: 4.11
4+
Contact: Enric Balletbo i Serra <eballetbo@gmail.com>
5+
Description: Attribute for enable/disable the trickle charge bypass
6+
The trickle_charge_bypass attribute allows the userspace to
7+
enable/disable the Trickle charge FET bypass.

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,16 @@ Description:
170170
Has all of the equivalent parameters as per voltageY. Units
171171
after application of scale and offset are m/s^2.
172172

173+
What: /sys/bus/iio/devices/iio:deviceX/in_gravity_x_raw
174+
What: /sys/bus/iio/devices/iio:deviceX/in_gravity_y_raw
175+
What: /sys/bus/iio/devices/iio:deviceX/in_gravity_z_raw
176+
KernelVersion: 4.11
177+
Contact: linux-iio@vger.kernel.org
178+
Description:
179+
Gravity in direction x, y or z (may be arbitrarily assigned
180+
but should match other such assignments on device).
181+
Units after application of scale and offset are m/s^2.
182+
173183
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_raw
174184
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_raw
175185
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_raw
@@ -805,7 +815,7 @@ Description:
805815
attribute. E.g. if in_voltage0_raw_thresh_rising_value is set to 1200
806816
and in_voltage0_raw_thresh_rising_hysteresis is set to 50. The event
807817
will get activated once in_voltage0_raw goes above 1200 and will become
808-
deactived again once the value falls below 1150.
818+
deactivated again once the value falls below 1150.
809819

810820
What: /sys/.../events/in_accel_x_raw_roc_rising_value
811821
What: /sys/.../events/in_accel_x_raw_roc_falling_value
@@ -1245,7 +1255,8 @@ Description:
12451255
reflectivity of infrared or ultrasound emitted.
12461256
Often these sensors are unit less and as such conversion
12471257
to SI units is not possible. Higher proximity measurements
1248-
indicate closer objects, and vice versa.
1258+
indicate closer objects, and vice versa. Units after
1259+
application of scale and offset are meters.
12491260

12501261
What: /sys/.../iio:deviceX/in_illuminance_input
12511262
What: /sys/.../iio:deviceX/in_illuminance_raw

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/bus/iio/devices/triggerX/trigger_polarity
2+
KernelVersion: 4.11
3+
Contact: fabrice.gasnier@st.com
4+
Description:
5+
The STM32 ADC can be configured to use external trigger sources
6+
(e.g. timers, pwm or exti gpio). Then, it can be tuned to start
7+
conversions on external trigger by either:
8+
- "rising-edge"
9+
- "falling-edge"
10+
- "both-edges".
11+
Reading returns current trigger polarity.
12+
Writing value before enabling conversions sets trigger polarity.
13+
14+
What: /sys/bus/iio/devices/triggerX/trigger_polarity_available
15+
KernelVersion: 4.11
16+
Contact: fabrice.gasnier@st.com
17+
Description:
18+
List all available trigger_polarity settings.

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What /sys/bus/iio/devices/iio:deviceX/sensor_sensitivity
2+
Date: January 2017
3+
KernelVersion: 4.11
4+
Contact: linux-iio@vger.kernel.org
5+
Description:
6+
Show or set the gain boost of the amp, from 0-31 range.
7+
default 31
8+
9+
What /sys/bus/iio/devices/iio:deviceX/sensor_max_range
10+
Date: January 2017
11+
KernelVersion: 4.11
12+
Contact: linux-iio@vger.kernel.org
13+
Description:
14+
Show or set the maximum range between the sensor and the
15+
first object echoed in meters. Default value is 6.020.
16+
This setting limits the time the driver is waiting for a
17+
echo.
18+
Showing the range of available values is represented as the
19+
minimum value, the step and the maximum value, all enclosed
20+
in square brackets.
21+
Example:
22+
[0.043 0.043 11.008]

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
What: /sys/bus/iio/devices/triggerX/master_mode_available
2+
KernelVersion: 4.11
3+
Contact: benjamin.gaignard@st.com
4+
Description:
5+
Reading returns the list possible master modes which are:
6+
- "reset" : The UG bit from the TIMx_EGR register is used as trigger output (TRGO).
7+
- "enable" : The Counter Enable signal CNT_EN is used as trigger output.
8+
- "update" : The update event is selected as trigger output.
9+
For instance a master timer can then be used as a prescaler for a slave timer.
10+
- "compare_pulse" : The trigger output send a positive pulse when the CC1IF flag is to be set.
11+
- "OC1REF" : OC1REF signal is used as trigger output.
12+
- "OC2REF" : OC2REF signal is used as trigger output.
13+
- "OC3REF" : OC3REF signal is used as trigger output.
14+
- "OC4REF" : OC4REF signal is used as trigger output.
15+
16+
What: /sys/bus/iio/devices/triggerX/master_mode
17+
KernelVersion: 4.11
18+
Contact: benjamin.gaignard@st.com
19+
Description:
20+
Reading returns the current master modes.
21+
Writing set the master mode
22+
23+
What: /sys/bus/iio/devices/triggerX/sampling_frequency
24+
KernelVersion: 4.11
25+
Contact: benjamin.gaignard@st.com
26+
Description:
27+
Reading returns the current sampling frequency.
28+
Writing an value different of 0 set and start sampling.
29+
Writing 0 stop sampling.

0 commit comments

Comments
 (0)