Skip to content

Commit 245f0db

Browse files
dtordtor
committed
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to fix pxa/raumfeld rotary encoder properties.
2 parents 24672bd + b562e44 commit 245f0db

File tree

10,713 files changed

+633649
-343064
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,713 files changed

+633649
-343064
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Andrey Ryabinin <[email protected]> <[email protected]>
2121
Andrew Morton <[email protected]>
2222
Andrew Vasquez <[email protected]>
2323
Andy Adamson <[email protected]>
24+
Antonio Ospite <[email protected]> <[email protected]>
2425
Archit Taneja <[email protected]>
2526
Arnaud Patard <[email protected]>
2627
Arnd Bergmann <[email protected]>

‎CREDITS

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ N: NeilBrown
534534
E: [email protected]
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: [email protected]
@@ -1507,6 +1508,14 @@ S: 312/107 Canberra Avenue
15071508
S: Griffith, ACT 2603
15081509
S: Australia
15091510

1511+
N: Andreas Herrmann
1512+
E: [email protected]
1513+
E: [email protected]
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: [email protected]
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: [email protected]
1861+
E: [email protected]
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: [email protected]
18521871
D: Disk usage statistics and modifications to line printer driver

‎Documentation/ABI/testing/configfs-iio

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: [email protected]
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.

‎Documentation/ABI/testing/configfs-rdma_cm

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

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

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.

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

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: [email protected]
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: [email protected]
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 <[email protected]>
141+
Lu Baolu <[email protected]>
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 <[email protected]>
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 <[email protected]>

‎Documentation/ABI/testing/sysfs-class-infiniband

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: [email protected]
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: [email protected]
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 <[email protected]>
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

‎Documentation/ABI/testing/sysfs-class-net-mesh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Description:
88

99
What: /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation
1010
Date: May 2011
11-
Contact: Antonio Quartulli <[email protected]>
11+
Contact: Antonio Quartulli <[email protected]>
1212
Description:
1313
Indicates whether the data traffic going from a
1414
wireless client to another wireless client will be
@@ -70,7 +70,7 @@ Description:
7070

7171
What: /sys/class/net/<mesh_iface>/mesh/isolation_mark
7272
Date: Nov 2013
73-
Contact: Antonio Quartulli <[email protected]>
73+
Contact: Antonio Quartulli <[email protected]>
7474
Description:
7575
Defines the isolation mark (and its bitmask) which
7676
is used to classify clients as "isolated" by the

‎Documentation/ABI/testing/sysfs-class-net-qmi

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
What: /sys/class/net/<iface>/qmi/raw_ip
2+
Date: Dec 2015
3+
KernelVersion: 4.4
4+
Contact: Bjørn Mork <[email protected]>
5+
Description:
6+
Boolean. Default: 'N'
7+
8+
Set this to 'Y' to change the network device link
9+
framing from '802.3' to 'raw-ip'.
10+
11+
The netdev will change to reflect the link framing
12+
mode. The netdev is an ordinary ethernet device in
13+
'802.3' mode, and the driver expects to exchange
14+
frames with an ethernet header over the USB link. The
15+
netdev is a headerless p-t-p device in 'raw-ip' mode,
16+
and the driver expects to echange IPv4 or IPv6 packets
17+
without any L2 header over the USB link.
18+
19+
Userspace is in full control of firmware configuration
20+
through the delegation of the QMI protocol. Userspace
21+
is responsible for coordination of driver and firmware
22+
link framing mode, changing this setting to 'Y' if the
23+
firmware is configured for 'raw-ip' mode.

‎Documentation/ABI/testing/sysfs-class-watchdog

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
What: /sys/class/watchdog/watchdogn/bootstatus
2+
Date: August 2015
3+
Contact: Wim Van Sebroeck <[email protected]>
4+
Description:
5+
It is a read only file. It contains status of the watchdog
6+
device at boot. It is equivalent to WDIOC_GETBOOTSTATUS of
7+
ioctl interface.
8+
9+
What: /sys/class/watchdog/watchdogn/identity
10+
Date: August 2015
11+
Contact: Wim Van Sebroeck <[email protected]>
12+
Description:
13+
It is a read only file. It contains identity string of
14+
watchdog device.
15+
16+
What: /sys/class/watchdog/watchdogn/nowayout
17+
Date: August 2015
18+
Contact: Wim Van Sebroeck <[email protected]>
19+
Description:
20+
It is a read only file. While reading, it gives '1' if that
21+
device supports nowayout feature else, it gives '0'.
22+
23+
What: /sys/class/watchdog/watchdogn/state
24+
Date: August 2015
25+
Contact: Wim Van Sebroeck <[email protected]>
26+
Description:
27+
It is a read only file. It gives active/inactive status of
28+
watchdog device.
29+
30+
What: /sys/class/watchdog/watchdogn/status
31+
Date: August 2015
32+
Contact: Wim Van Sebroeck <[email protected]>
33+
Description:
34+
It is a read only file. It contains watchdog device's
35+
internal status bits. It is equivalent to WDIOC_GETSTATUS
36+
of ioctl interface.
37+
38+
What: /sys/class/watchdog/watchdogn/timeleft
39+
Date: August 2015
40+
Contact: Wim Van Sebroeck <[email protected]>
41+
Description:
42+
It is a read only file. It contains value of time left for
43+
reset generation. It is equivalent to WDIOC_GETTIMELEFT of
44+
ioctl interface.
45+
46+
What: /sys/class/watchdog/watchdogn/timeout
47+
Date: August 2015
48+
Contact: Wim Van Sebroeck <[email protected]>
49+
Description:
50+
It is a read only file. It is read to know about current
51+
value of timeout programmed.

‎Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ Contact: "Jaegeuk Kim" <[email protected]>
8787
Description:
8888
Controls the checkpoint timing.
8989

90+
What: /sys/fs/f2fs/<disk>/idle_interval
91+
Date: January 2016
92+
Contact: "Jaegeuk Kim" <[email protected]>
93+
Description:
94+
Controls the idle timing.
95+
9096
What: /sys/fs/f2fs/<disk>/ra_nid_pages
9197
Date: October 2015
9298
Contact: "Chao Yu" <[email protected]>

‎Documentation/ABI/testing/sysfs-kernel-livepatch

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@ Description:
3333
The object directory contains subdirectories for each function
3434
that is patched within the object.
3535

36-
What: /sys/kernel/livepatch/<patch>/<object>/<function>
36+
What: /sys/kernel/livepatch/<patch>/<object>/<function,sympos>
3737
Date: Nov 2014
3838
KernelVersion: 3.19.0
3939
Contact: [email protected]
4040
Description:
4141
The function directory contains attributes regarding the
4242
properties and state of the patched function.
4343

44+
The directory name contains the patched function name and a
45+
sympos number corresponding to the nth occurrence of the symbol
46+
name in kallsyms for the patched object.
47+
4448
There are currently no such attributes.

‎Documentation/ABI/testing/sysfs-ptp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Description:
7474
assignment may be changed by two writing numbers into
7575
the file.
7676

77-
What: /sys/class/ptp/ptpN/pps_avaiable
77+
What: /sys/class/ptp/ptpN/pps_available
7878
Date: September 2010
7979
Contact: Richard Cochran <[email protected]>
8080
Description:

‎Documentation/CodingStyle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ The rationale for using gotos is:
430430
return result;
431431
}
432432

433-
A common type of bug to be aware of it "one err bugs" which look like this:
433+
A common type of bug to be aware of is "one err bugs" which look like this:
434434

435435
err:
436436
kfree(foo->bar);

‎Documentation/DMA-API-HOWTO.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -951,16 +951,6 @@ to "Closing".
951951
alignment constraints (e.g. the alignment constraints about 64-bit
952952
objects).
953953

954-
3) Supporting multiple types of IOMMUs
955-
956-
If your architecture needs to support multiple types of IOMMUs, you
957-
can use include/linux/asm-generic/dma-mapping-common.h. It's a
958-
library to support the DMA API with multiple types of IOMMUs. Lots
959-
of architectures (x86, powerpc, sh, alpha, ia64, microblaze and
960-
sparc) use it. Choose one to see how it can be used. If you need to
961-
support multiple types of IOMMUs in a single system, the example of
962-
x86 or powerpc helps.
963-
964954
Closing
965955

966956
This document, and the API itself, would not be in its current

‎Documentation/DMA-API.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ are guaranteed also to be cache line boundaries).
236236

237237
DMA_TO_DEVICE synchronisation must be done after the last modification
238238
of the memory region by the software and before it is handed off to
239-
the driver. Once this primitive is used, memory covered by this
239+
the device. Once this primitive is used, memory covered by this
240240
primitive should be treated as read-only by the device. If the device
241241
may write to it at any point, it should be DMA_BIDIRECTIONAL (see
242242
below).

0 commit comments

Comments
 (0)