Skip to content

Commit 9c2edd8

Browse files
gregkhgregkh
committed
Merge 4.8-rc5 into staging-next
We want the staging fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents aa652b1 + c693593 commit 9c2edd8

812 files changed

Lines changed: 8965 additions & 4628 deletions

File tree

Some content is hidden

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

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
158158
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
159159
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
160160
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
161+
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
162+
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
161163
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
162164
Yusuke Goda <goda.yusuke@renesas.com>
163165
Gustavo Padovan <gustavo@las.ic.unicamp.br>

‎Documentation/ABI/stable/sysfs-devices‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note: This documents additional properties of any device beyond what
22
# is documented in Documentation/sysfs-rules.txt
33

4-
What: /sys/devices/*/of_path
4+
What: /sys/devices/*/of_node
55
Date: February 2015
66
Contact: Device Tree mailing list <devicetree@vger.kernel.org>
77
Description:

‎Documentation/PCI/MSI-HOWTO.txt‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,11 @@ has a requirements for a minimum number of vectors the driver can pass a
9494
min_vecs argument set to this limit, and the PCI core will return -ENOSPC
9595
if it can't meet the minimum number of vectors.
9696

97-
The flags argument should normally be set to 0, but can be used to pass the
98-
PCI_IRQ_NOMSI and PCI_IRQ_NOMSIX flag in case a device claims to support
99-
MSI or MSI-X, but the support is broken, or to pass PCI_IRQ_NOLEGACY in
100-
case the device does not support legacy interrupt lines.
101-
102-
By default this function will spread the interrupts around the available
103-
CPUs, but this feature can be disabled by passing the PCI_IRQ_NOAFFINITY
104-
flag.
97+
The flags argument is used to specify which type of interrupt can be used
98+
by the device and the driver (PCI_IRQ_LEGACY, PCI_IRQ_MSI, PCI_IRQ_MSIX).
99+
A convenient short-hand (PCI_IRQ_ALL_TYPES) is also available to ask for
100+
any possible kind of interrupt. If the PCI_IRQ_AFFINITY flag is set,
101+
pci_alloc_irq_vectors() will spread the interrupts around the available CPUs.
105102

106103
To get the Linux IRQ numbers passed to request_irq() and free_irq() and the
107104
vectors, use the following function:
@@ -131,7 +128,7 @@ larger than the number supported by the device it will automatically be
131128
capped to the supported limit, so there is no need to query the number of
132129
vectors supported beforehand:
133130

134-
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, 0);
131+
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_ALL_TYPES)
135132
if (nvec < 0)
136133
goto out_err;
137134

@@ -140,23 +137,22 @@ interrupts it can request a particular number of interrupts by passing that
140137
number to pci_alloc_irq_vectors() function as both 'min_vecs' and
141138
'max_vecs' parameters:
142139

143-
ret = pci_alloc_irq_vectors(pdev, nvec, nvec, 0);
140+
ret = pci_alloc_irq_vectors(pdev, nvec, nvec, PCI_IRQ_ALL_TYPES);
144141
if (ret < 0)
145142
goto out_err;
146143

147144
The most notorious example of the request type described above is enabling
148145
the single MSI mode for a device. It could be done by passing two 1s as
149146
'min_vecs' and 'max_vecs':
150147

151-
ret = pci_alloc_irq_vectors(pdev, 1, 1, 0);
148+
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
152149
if (ret < 0)
153150
goto out_err;
154151

155152
Some devices might not support using legacy line interrupts, in which case
156-
the PCI_IRQ_NOLEGACY flag can be used to fail the request if the platform
157-
can't provide MSI or MSI-X interrupts:
153+
the driver can specify that only MSI or MSI-X is acceptable:
158154

159-
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_NOLEGACY);
155+
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_MSI | PCI_IRQ_MSIX);
160156
if (nvec < 0)
161157
goto out_err;
162158

‎Documentation/PCI/pci.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver
124124

125125
The ID table is an array of struct pci_device_id entries ending with an
126126
all-zero entry. Definitions with static const are generally preferred.
127-
Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
128127

129128
Each entry consists of:
130129

‎Documentation/arm64/silicon-errata.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ stable kernels.
5353
| ARM | Cortex-A57 | #832075 | ARM64_ERRATUM_832075 |
5454
| ARM | Cortex-A57 | #852523 | N/A |
5555
| ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 |
56+
| ARM | Cortex-A72 | #853709 | N/A |
5657
| ARM | MMU-500 | #841119,#826419 | N/A |
5758
| | | | |
5859
| Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 |

‎Documentation/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
todo_include_todos = False
132132

133133
primary_domain = 'C'
134-
highlight_language = 'C'
134+
highlight_language = 'guess'
135135

136136
# -- Options for HTML output ----------------------------------------------
137137

‎Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@ Required properties:
1616
- vref-supply: The regulator supply ADC reference voltage.
1717
- #io-channel-cells: Should be 1, see ../iio-bindings.txt
1818

19+
Optional properties:
20+
- resets: Must contain an entry for each entry in reset-names if need support
21+
this option. See ../reset/reset.txt for details.
22+
- reset-names: Must include the name "saradc-apb".
23+
1924
Example:
2025
saradc: saradc@2006c000 {
2126
compatible = "rockchip,saradc";
2227
reg = <0x2006c000 0x100>;
2328
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
2429
clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
2530
clock-names = "saradc", "apb_pclk";
31+
resets = <&cru SRST_SARADC>;
32+
reset-names = "saradc-apb";
2633
#io-channel-cells = <1>;
2734
vref-supply = <&vcc18>;
2835
};

‎Documentation/devicetree/bindings/serial/8250.txt‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ Optional properties:
4242
- auto-flow-control: one way to enable automatic flow control support. The
4343
driver is allowed to detect support for the capability even without this
4444
property.
45-
- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD
46-
line respectively. It will use specified GPIO instead of the peripheral
47-
function pin for the UART feature. If unsure, don't specify this property.
4845

4946
Note:
5047
* fsl,ns16550:
@@ -66,19 +63,3 @@ Example:
6663
interrupts = <10>;
6764
reg-shift = <2>;
6865
};
69-
70-
Example for OMAP UART using GPIO-based modem control signals:
71-
72-
uart4: serial@49042000 {
73-
compatible = "ti,omap3-uart";
74-
reg = <0x49042000 0x400>;
75-
interrupts = <80>;
76-
ti,hwmods = "uart4";
77-
clock-frequency = <48000000>;
78-
cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;
79-
rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
80-
dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
81-
dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
82-
dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
83-
rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
84-
};

‎Documentation/devicetree/bindings/sound/omap-mcpdm.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Required properties:
88
- interrupts: Interrupt number for McPDM
99
- interrupt-parent: The parent interrupt controller
1010
- ti,hwmods: Name of the hwmod associated to the McPDM
11-
- clocks: phandle for the pdmclk provider, likely <&twl6040>
12-
- clock-names: Must be "pdmclk"
1311

1412
Example:
1513

@@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 {
2119
interrupt-parent = <&gic>;
2220
ti,hwmods = "mcpdm";
2321
};
24-
25-
In board DTS file the pdmclk needs to be added:
26-
27-
&mcpdm {
28-
clocks = <&twl6040>;
29-
clock-names = "pdmclk";
30-
status = "okay";
31-
};

‎Documentation/devicetree/bindings/thermal/thermal.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ For more examples of cooling devices, refer to the example sections below.
6262
Required properties:
6363
- #cooling-cells: Used to provide cooling device specific information
6464
Type: unsigned while referring to it. Must be at least 2, in order
65-
Size: one cell to specify minimum and maximum cooling state used
65+
Size: one cell to specify minimum and maximum cooling state used
6666
in the reference. The first cell is the minimum
6767
cooling state requested and the second cell is
6868
the maximum cooling state requested in the reference.
@@ -119,7 +119,7 @@ Required properties:
119119
Optional property:
120120
- contribution: The cooling contribution to the thermal zone of the
121121
Type: unsigned referred cooling device at the referred trip point.
122-
Size: one cell The contribution is a ratio of the sum
122+
Size: one cell The contribution is a ratio of the sum
123123
of all cooling contributions within a thermal zone.
124124

125125
Note: Using the THERMAL_NO_LIMIT (-1UL) constant in the cooling-device phandle
@@ -145,7 +145,7 @@ Required properties:
145145
Size: one cell
146146

147147
- thermal-sensors: A list of thermal sensor phandles and sensor specifier
148-
Type: list of used while monitoring the thermal zone.
148+
Type: list of used while monitoring the thermal zone.
149149
phandles + sensor
150150
specifier
151151

@@ -473,7 +473,7 @@ thermal-zones {
473473
<&adc>; /* pcb north */
474474

475475
/* hotspot = 100 * bandgap - 120 * adc + 484 */
476-
coefficients = <100 -120 484>;
476+
coefficients = <100 -120 484>;
477477

478478
trips {
479479
...
@@ -502,7 +502,7 @@ from the ADC sensor. The binding would be then:
502502
thermal-sensors = <&adc>;
503503

504504
/* hotspot = 1 * adc + 6000 */
505-
coefficients = <1 6000>;
505+
coefficients = <1 6000>;
506506

507507
(d) - Board thermal
508508

0 commit comments

Comments
 (0)