Skip to content

Commit 03e075b

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 753b11e + 34229b2 commit 03e075b

File tree

10,745 files changed

+636339
-290707
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,745 files changed

+636339
-290707
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
2121
Andrew Morton <akpm@linux-foundation.org>
2222
Andrew Vasquez <andrew.vasquez@qlogic.com>
2323
Andy Adamson <andros@citi.umich.edu>
24+
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
2425
Archit Taneja <archit@ti.com>
2526
Arnaud Patard <arnaud.patard@rtp-net.org>
2627
Arnd Bergmann <arnd@arndb.de>

CREDITS

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ N: NeilBrown
534534
E: neil@brown.name
535535
P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F 497A 39EC 9EDD 5662 81B9
536536
D: NFSD Maintainer 2000-2007
537+
D: MD Maintainer 2001-2016
537538

538539
N: Zach Brown
539540
E: zab@zabbo.net
@@ -1507,6 +1508,14 @@ S: 312/107 Canberra Avenue
15071508
S: Griffith, ACT 2603
15081509
S: Australia
15091510

1511+
N: Andreas Herrmann
1512+
E: herrmann.der.user@gmail.com
1513+
E: herrmann.der.user@googlemail.com
1514+
D: Key developer of x86/AMD64
1515+
D: Author of AMD family 15h processor power monitoring driver
1516+
D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver
1517+
S: Germany
1518+
15101519
N: Sebastian Hetze
15111520
E: she@lunetix.de
15121521
D: German Linux Documentation,
@@ -1847,6 +1856,16 @@ S: Korte Heul 95
18471856
S: 1403 ND BUSSUM
18481857
S: The Netherlands
18491858

1859+
N: Martin Kepplinger
1860+
E: martink@posteo.de
1861+
E: martin.kepplinger@theobroma-systems.com
1862+
W: http://www.martinkepplinger.com
1863+
D: mma8452 accelerators iio driver
1864+
D: Kernel cleanups
1865+
S: Garnisonstraße 26
1866+
S: 4020 Linz
1867+
S: Austria
1868+
18501869
N: Karl Keyte
18511870
E: karl@koft.com
18521871
D: Disk usage statistics and modifications to line printer driver
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /config/iio
2+
Date: October 2015
3+
KernelVersion: 4.4
4+
Contact: linux-iio@vger.kernel.org
5+
Description:
6+
This represents Industrial IO configuration entry point
7+
directory. It contains sub-groups corresponding to IIO
8+
objects.
9+
10+
What: /config/iio/triggers
11+
Date: October 2015
12+
KernelVersion: 4.4
13+
Description:
14+
Industrial IO software triggers directory.
15+
16+
What: /config/iio/triggers/hrtimers
17+
Date: October 2015
18+
KernelVersion: 4.4
19+
Description:
20+
High resolution timers directory. Creating a directory here
21+
will result in creating a hrtimer trigger in the IIO subsystem.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What: /config/rdma_cm
2+
Date: November 29, 2015
3+
KernelVersion: 4.4.0
4+
Description: Interface is used to configure RDMA-cable HCAs in respect to
5+
RDMA-CM attributes.
6+
7+
Attributes are visible only when configfs is mounted. To mount
8+
configfs in /config directory use:
9+
# mount -t configfs none /config/
10+
11+
In order to set parameters related to a specific HCA, a directory
12+
for this HCA has to be created:
13+
mkdir -p /config/rdma_cm/<hca>
14+
15+
16+
What: /config/rdma_cm/<hca>/ports/<port-num>/default_roce_mode
17+
Date: November 29, 2015
18+
KernelVersion: 4.4.0
19+
Description: RDMA-CM based connections from HCA <hca> at port <port-num>
20+
will be initiated with this RoCE type as default.
21+
The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
22+
This parameter has RW access.

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ Description:
1010
isoc_mult - 0..2 (hs/ss only)
1111
isoc_maxburst - 0..15 (ss only)
1212
buflen - buffer length
13+
bulk_qlen - depth of queue for bulk
14+
iso_qlen - depth of queue for iso
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
What: /config/usb-gadget/gadget/functions/tcm.name
2+
Date: Dec 2015
3+
KernelVersion: 4.5
4+
Description:
5+
There are no attributes because all the configuration
6+
is performed in the "target" subsystem of configfs.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_allow_async_readout
2+
Date: December 2015
3+
KernelVersion: 4.4
4+
Contact: linux-iio@vger.kernel.org
5+
Description:
6+
By default (value '0'), the capture thread checks for the Conversion
7+
Ready Flag to being set prior to committing a new value to the sample
8+
buffer. This synchronizes the in-chip conversion rate with the
9+
in-driver readout rate at the cost of an additional register read.
10+
11+
Writing '1' will remove the polling for the Conversion Ready Flags to
12+
save the additional i2c transaction, which will improve the bandwidth
13+
available for reading data. However, samples can be occasionally skipped
14+
or repeated, depending on the beat between the capture and conversion
15+
rates.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/in_shunt_resistor
18+
Date: December 2015
19+
KernelVersion: 4.4
20+
Contact: linux-iio@vger.kernel.org
21+
Description:
22+
The value of the shunt resistor may be known only at runtime fom an
23+
eeprom content read by a client application. This attribute allows to
24+
set its value in ohms.

Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,21 @@ Description:
134134
enabled for the device. Developer can write y/Y/1 or n/N/0 to
135135
the file to enable/disable the feature.
136136

137-
What: /sys/bus/usb/devices/.../power/usb3_hardware_lpm
138-
Date: June 2015
137+
What: /sys/bus/usb/devices/.../power/usb3_hardware_lpm_u1
138+
/sys/bus/usb/devices/.../power/usb3_hardware_lpm_u2
139+
Date: November 2015
139140
Contact: Kevin Strasser <kevin.strasser@linux.intel.com>
141+
Lu Baolu <baolu.lu@linux.intel.com>
140142
Description:
141143
If CONFIG_PM is set and a USB 3.0 lpm-capable device is plugged
142144
in to a xHCI host which supports link PM, it will check if U1
143145
and U2 exit latencies have been set in the BOS descriptor; if
144-
the check is is passed and the host supports USB3 hardware LPM,
146+
the check is passed and the host supports USB3 hardware LPM,
145147
USB3 hardware LPM will be enabled for the device and the USB
146-
device directory will contain a file named
147-
power/usb3_hardware_lpm. The file holds a string value (enable
148-
or disable) indicating whether or not USB3 hardware LPM is
149-
enabled for the device.
148+
device directory will contain two files named
149+
power/usb3_hardware_lpm_u1 and power/usb3_hardware_lpm_u2. These
150+
files hold a string value (enable or disable) indicating whether
151+
or not USB3 hardware LPM U1 or U2 is enabled for the device.
150152

151153
What: /sys/bus/usb/devices/.../removable
152154
Date: February 2012
@@ -187,6 +189,17 @@ Description:
187189
The file will read "hotplug", "wired" and "not used" if the
188190
information is available, and "unknown" otherwise.
189191

192+
What: /sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
193+
Date: November 2015
194+
Contact: Lu Baolu <baolu.lu@linux.intel.com>
195+
Description:
196+
Some USB3.0 devices are not friendly to USB3 LPM. usb3_lpm_permit
197+
attribute allows enabling/disabling usb3 lpm of a port. It takes
198+
effect both before and after a usb device is enumerated. Supported
199+
values are "0" if both u1 and u2 are NOT permitted, "u1" if only u1
200+
is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and
201+
u2 are permitted.
202+
190203
What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
191204
Date: May 2013
192205
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: /sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/ndevs/<gid-index>
2+
Date: November 29, 2015
3+
KernelVersion: 4.4.0
4+
Contact: linux-rdma@vger.kernel.org
5+
Description: The net-device's name associated with the GID resides
6+
at index <gid-index>.
7+
8+
What: /sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/types/<gid-index>
9+
Date: November 29, 2015
10+
KernelVersion: 4.4.0
11+
Contact: linux-rdma@vger.kernel.org
12+
Description: The RoCE type of the associated GID resides at index <gid-index>.
13+
This could either be "IB/RoCE v1" for IB and RoCE v1 based GODs
14+
or "RoCE v2" for RoCE v2 based GIDs.
15+
16+

Documentation/ABI/testing/sysfs-class-net-cdc_ncm

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,25 @@ Description:
1919
Set to 0 to pad all frames. Set greater than tx_max to
2020
disable all padding.
2121

22+
What: /sys/class/net/<iface>/cdc_ncm/ndp_to_end
23+
Date: Dec 2015
24+
KernelVersion: 4.5
25+
Contact: Bjørn Mork <bjorn@mork.no>
26+
Description:
27+
Boolean attribute showing the status of the "NDP to
28+
end" quirk. Defaults to 'N', except for devices
29+
already known to need it enabled.
30+
31+
The "NDP to end" quirk makes the driver place the NDP
32+
(the packet index table) after the payload. The NCM
33+
specification does not mandate this, but some devices
34+
are known to be more restrictive. Write 'Y' to this
35+
attribute for temporary testing of a suspect device
36+
failing to work with the default driver settings.
37+
38+
A device entry should be added to the driver if this
39+
quirk is found to be required.
40+
2241
What: /sys/class/net/<iface>/cdc_ncm/rx_max
2342
Date: May 2014
2443
KernelVersion: 3.16

0 commit comments

Comments
 (0)