Skip to content

Commit 6ea7e38

Browse files
jejbjejb
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

0 commit comments

Comments
 (0)