Skip to content

Commit 6ea7e38

Browse files
James BottomleyJames Bottomley
James Bottomley
authored and
James Bottomley
committed
Merge branch 'fixes-base' into fixes
2 parents 5ddfe08 + f55532a commit 6ea7e38

File tree

9,532 files changed

+530694
-275731
lines changed

Some content is hidden

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

9,532 files changed

+530694
-275731
lines changed

‎CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,6 +3054,7 @@ D: PLX USB338x driver
30543054
D: PCA9634 driver
30553055
D: Option GTM671WFS
30563056
D: Fintek F81216A
3057+
D: AD5761 iio driver
30573058
D: Various kernel hacks
30583059
S: Qtechnology A/S
30593060
S: Valby Langgade 142

‎Documentation/ABI/obsolete/sysfs-class-rfkill

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

‎Documentation/ABI/testing/sysfs-gpio renamed to ‎Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/class/gpio/
22
Date: July 2008
33
KernelVersion: 2.6.27
4-
Contact: David Brownell <dbrownell@users.sourceforge.net>
4+
Contact: Linus Walleij <linusw@kernel.org>
55
Description:
66

77
As a Kconfig option, individual GPIO signals may be accessed from
@@ -26,3 +26,5 @@ Description:
2626
/label ... (r/o) descriptive, not necessarily unique
2727
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
2828

29+
This ABI is deprecated and will be removed after 2020. It is
30+
replaced with the GPIO character device.

‎Documentation/ABI/removed/sysfs-class-rfkill

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
rfkill - radio frequency (RF) connector kill switch support
2+
3+
For details to this subsystem look at Documentation/rfkill.txt.
4+
5+
What: /sys/class/rfkill/rfkill[0-9]+/claim
6+
Date: 09-Jul-2007
7+
KernelVersion v2.6.22
8+
Contact: linux-wireless@vger.kernel.org
9+
Description: This file was deprecated because there no longer was a way to
10+
claim just control over a single rfkill instance.
11+
This file was scheduled to be removed in 2012, and was removed
12+
in 2016.
13+
Values: 0: Kernel handles events

‎Documentation/ABI/stable/firewire-cdev

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,5 @@ Description:
100100

101101
Users: libraw1394
102102
libdc1394
103-
tools like jujuutils, fwhack, ...
103+
libhinawa
104+
tools like linux-firewire-utils, fwhack, ...

‎Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,17 @@ Description: The mapping of which primary/sub channels are bound to which
2727
Virtual Processors.
2828
Format: <channel's child_relid:the bound cpu's number>
2929
Users: tools/hv/lsvmbus
30+
31+
What: /sys/bus/vmbus/devices/vmbus_*/device
32+
Date: Dec. 2015
33+
KernelVersion: 4.5
34+
Contact: K. Y. Srinivasan <kys@microsoft.com>
35+
Description: The 16 bit device ID of the device
36+
Users: tools/hv/lsvmbus and user level RDMA libraries
37+
38+
What: /sys/bus/vmbus/devices/vmbus_*/vendor
39+
Date: Dec. 2015
40+
KernelVersion: 4.5
41+
Contact: K. Y. Srinivasan <kys@microsoft.com>
42+
Description: The 16 bit vendor ID of the device
43+
Users: tools/hv/lsvmbus and user level RDMA libraries

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ rfkill - radio frequency (RF) connector kill switch support
22

33
For details to this subsystem look at Documentation/rfkill.txt.
44

5-
For the deprecated /sys/class/rfkill/*/state and
6-
/sys/class/rfkill/*/claim knobs of this interface look in
7-
Documentation/ABI/obsolete/sysfs-class-rfkill.
5+
For the deprecated /sys/class/rfkill/*/claim knobs of this interface look in
6+
Documentation/ABI/removed/sysfs-class-rfkill.
87

98
What: /sys/class/rfkill
109
Date: 09-Jul-2007
@@ -42,6 +41,28 @@ Values: A numeric value.
4241
1: true
4342

4443

44+
What: /sys/class/rfkill/rfkill[0-9]+/state
45+
Date: 09-Jul-2007
46+
KernelVersion v2.6.22
47+
Contact: linux-wireless@vger.kernel.org
48+
Description: Current state of the transmitter.
49+
This file was scheduled to be removed in 2014, but due to its
50+
large number of users it will be sticking around for a bit
51+
longer. Despite it being marked as stabe, the newer "hard" and
52+
"soft" interfaces should be preffered, since it is not possible
53+
to express the 'soft and hard block' state of the rfkill driver
54+
through this interface. There will likely be another attempt to
55+
remove it in the future.
56+
Values: A numeric value.
57+
0: RFKILL_STATE_SOFT_BLOCKED
58+
transmitter is turned off by software
59+
1: RFKILL_STATE_UNBLOCKED
60+
transmitter is (potentially) active
61+
2: RFKILL_STATE_HARD_BLOCKED
62+
transmitter is forced off by something outside of
63+
the driver's control.
64+
65+
4566
What: /sys/class/rfkill/rfkill[0-9]+/hard
4667
Date: 12-March-2010
4768
KernelVersion v2.6.34

‎Documentation/ABI/stable/sysfs-fs-orangefs

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
What: /sys/fs/orangefs/perf_counters/*
2+
Date: Jun 2015
3+
Contact: Mike Marshall <hubcap@omnibond.com>
4+
Description:
5+
Counters and settings for various caches.
6+
Read only.
7+
8+
9+
What: /sys/fs/orangefs/perf_counter_reset
10+
Date: June 2015
11+
Contact: Mike Marshall <hubcap@omnibond.com>
12+
Description:
13+
echo a 0 or a 1 into perf_counter_reset to
14+
reset all the counters in
15+
/sys/fs/orangefs/perf_counters
16+
except ones with PINT_PERF_PRESERVE set.
17+
18+
19+
What: /sys/fs/orangefs/perf_time_interval_secs
20+
Date: Jun 2015
21+
Contact: Mike Marshall <hubcap@omnibond.com>
22+
Description:
23+
Length of perf counter intervals in
24+
seconds.
25+
26+
27+
What: /sys/fs/orangefs/perf_history_size
28+
Date: Jun 2015
29+
Contact: Mike Marshall <hubcap@omnibond.com>
30+
Description:
31+
The perf_counters cache statistics have N, or
32+
perf_history_size, samples. The default is
33+
one.
34+
35+
Every perf_time_interval_secs the (first)
36+
samples are reset.
37+
38+
If N is greater than one, the "current" set
39+
of samples is reset, and the samples from the
40+
other N-1 intervals remain available.
41+
42+
43+
What: /sys/fs/orangefs/op_timeout_secs
44+
Date: Jun 2015
45+
Contact: Mike Marshall <hubcap@omnibond.com>
46+
Description:
47+
Service operation timeout in seconds.
48+
49+
50+
What: /sys/fs/orangefs/slot_timeout_secs
51+
Date: Jun 2015
52+
Contact: Mike Marshall <hubcap@omnibond.com>
53+
Description:
54+
"Slot" timeout in seconds. A "slot"
55+
is an indexed buffer in the shared
56+
memory segment used for communication
57+
between the kernel module and userspace.
58+
Slots are requested and waited for,
59+
the wait times out after slot_timeout_secs.
60+
61+
62+
What: /sys/fs/orangefs/acache/*
63+
Date: Jun 2015
64+
Contact: Mike Marshall <hubcap@omnibond.com>
65+
Description:
66+
Attribute cache configurable settings.
67+
68+
69+
What: /sys/fs/orangefs/ncache/*
70+
Date: Jun 2015
71+
Contact: Mike Marshall <hubcap@omnibond.com>
72+
Description:
73+
Name cache configurable settings.
74+
75+
76+
What: /sys/fs/orangefs/capcache/*
77+
Date: Jun 2015
78+
Contact: Mike Marshall <hubcap@omnibond.com>
79+
Description:
80+
Capability cache configurable settings.
81+
82+
83+
What: /sys/fs/orangefs/ccache/*
84+
Date: Jun 2015
85+
Contact: Mike Marshall <hubcap@omnibond.com>
86+
Description:
87+
Credential cache configurable settings.

‎Documentation/ABI/testing/gpio-cdev

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
What: /dev/gpiochip[0-9]+
2+
Date: November 2015
3+
KernelVersion: 4.4
4+
Contact: linux-gpio@vger.kernel.org
5+
Description:
6+
The character device files /dev/gpiochip* are the interface
7+
between GPIO chips and userspace.
8+
9+
The ioctl(2)-based ABI is defined and documented in
10+
[include/uapi]<linux/gpio.h>.
11+
12+
The following file operations are supported:
13+
14+
open(2)
15+
Currently the only useful flags are O_RDWR.
16+
17+
ioctl(2)
18+
Initiate various actions.
19+
See the inline documentation in [include/uapi]<linux/gpio.h>
20+
for descriptions of all ioctls.
21+
22+
close(2)
23+
Stops and free up the I/O contexts that was associated
24+
with the file descriptor.
25+
26+
Users: TBD

‎Documentation/ABI/testing/ima_policy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Description:
2727

2828
base: func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
2929
[FIRMWARE_CHECK]
30+
[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]
3031
mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
3132
[[^]MAY_EXEC]
3233
fsmagic:= hex value

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,11 @@ Description:
496496
1kohm_to_gnd: connected to ground via an 1kOhm resistor,
497497
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
498498
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
499+
90kohm_to_gnd: connected to ground via a 90kOhm resistor,
499500
100kohm_to_gnd: connected to ground via an 100kOhm resistor,
501+
125kohm_to_gnd: connected to ground via an 125kOhm resistor,
500502
500kohm_to_gnd: connected to ground via a 500kOhm resistor,
503+
640kohm_to_gnd: connected to ground via a 640kOhm resistor,
501504
three_state: left floating.
502505
For a list of available output power down options read
503506
outX_powerdown_mode_available. If Y is not present the
@@ -1491,3 +1494,10 @@ Description:
14911494
This ABI is especially applicable for humidity sensors
14921495
to heatup the device and get rid of any condensation
14931496
in some humidity environment
1497+
1498+
What: /sys/bus/iio/devices/iio:deviceX/in_ph_raw
1499+
KernelVersion: 4.5
1500+
Contact: linux-iio@vger.kernel.org
1501+
Description:
1502+
Raw (unscaled no offset etc.) pH reading of a substance as a negative
1503+
base-10 logarithm of hydrodium ions in a litre of water.

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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 <afd@ti.com>
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 <afd@ti.com>
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
23+
KernelVersion:
24+
Contact: Andrew F. Davis <afd@ti.com>
25+
Description:
26+
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.
29+
30+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw
31+
Date: December 2015
32+
KernelVersion:
33+
Contact: Andrew F. Davis <afd@ti.com>
34+
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.
38+
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
42+
KernelVersion:
43+
Contact: Andrew F. Davis <afd@ti.com>
44+
Description:
45+
Get and set the offset cancellation DAC setting for these
46+
stages. The values are expressed in 5-bit sign-magnitude.
47+
48+
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_raw
49+
Date: December 2015
50+
KernelVersion:
51+
Contact: Andrew F. Davis <afd@ti.com>
52+
Description:
53+
Get and set the LED current for the specified LED. Y is the
54+
specific LED number.

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/meas_conf
2+
What: /sys/bus/iio/devices/iio:deviceX/meas_conf_available
3+
KernelVersion: 4.5
4+
Contact: linux-iio@vger.kernel.org
5+
Description:
6+
Current configuration and available configurations
7+
for the bias current.
8+
normal - Normal measurement configurations (default)
9+
positivebias - Positive bias configuration
10+
negativebias - Negative bias configuration
11+
disabled - Only available on HMC5983. Disables magnetic
12+
sensor and enables temperature sensor.
13+
Note: The effect of this configuration may vary
14+
according to the device. For exact documentation
15+
check the device's datasheet.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ Description:
55
Specifies the hardware conversion mode used. The three
66
available modes are "normal", "high-speed" and "low-power",
77
where the last is the default mode.
8+
9+
10+
What: /sys/bus/iio/devices/iio:deviceX/out_conversion_mode
11+
KernelVersion: 4.6
12+
Contact: linux-iio@vger.kernel.org
13+
Description:
14+
Specifies the hardware conversion mode used within DAC.
15+
The two available modes are "high-power" and "low-power",
16+
where "low-power" mode is the default mode.

0 commit comments

Comments
 (0)