Skip to content

Commit 0ddead9

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents f7aec12 + a090bd4 commit 0ddead9

File tree

451 files changed

+3846
-2246
lines changed

Some content is hidden

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

451 files changed

+3846
-2246
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,15 @@
866866

867867
dscc4.setup= [NET]
868868

869+
dt_cpu_ftrs= [PPC]
870+
Format: {"off" | "known"}
871+
Control how the dt_cpu_ftrs device-tree binding is
872+
used for CPU feature discovery and setup (if it
873+
exists).
874+
off: Do not use it, fall back to legacy cpu table.
875+
known: Do not pass through unknown features to guests
876+
or userspace, only those that the kernel is aware of.
877+
869878
dump_apple_properties [X86]
870879
Dump name and content of EFI device properties on
871880
x86 Macs. Useful for driver authors to determine

‎Documentation/devicetree/bindings/usb/dwc2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Required properties:
1010
- "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;
1111
- "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;
1212
- "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;
13+
- "amlogic,meson8-usb": The DWC2 USB controller instance in Amlogic Meson8 SoCs;
1314
- "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;
1415
- "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;
1516
- "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;

‎Documentation/networking/scaling.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ associated flow of the packet. The hash is either provided by hardware
122122
or will be computed in the stack. Capable hardware can pass the hash in
123123
the receive descriptor for the packet; this would usually be the same
124124
hash used for RSS (e.g. computed Toeplitz hash). The hash is saved in
125-
skb->rx_hash and can be used elsewhere in the stack as a hash of the
125+
skb->hash and can be used elsewhere in the stack as a hash of the
126126
packet’s flow.
127127

128128
Each receive hardware queue has an associated list of CPUs to which

‎MAINTAINERS

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ N: clps711x
11721172

11731173
ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
11741174
M: Hartley Sweeten <hsweeten@visionengravers.com>
1175-
M: Ryan Mallon <rmallon@gmail.com>
1175+
M: Alexander Sverdlin <alexander.sverdlin@gmail.com>
11761176
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
11771177
S: Maintained
11781178
F: arch/arm/mach-ep93xx/
@@ -1489,13 +1489,15 @@ M: Gregory Clement <gregory.clement@free-electrons.com>
14891489
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
14901490
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
14911491
S: Maintained
1492-
F: arch/arm/mach-mvebu/
1493-
F: drivers/rtc/rtc-armada38x.c
14941492
F: arch/arm/boot/dts/armada*
14951493
F: arch/arm/boot/dts/kirkwood*
1494+
F: arch/arm/configs/mvebu_*_defconfig
1495+
F: arch/arm/mach-mvebu/
14961496
F: arch/arm64/boot/dts/marvell/armada*
14971497
F: drivers/cpufreq/mvebu-cpufreq.c
1498-
F: arch/arm/configs/mvebu_*_defconfig
1498+
F: drivers/irqchip/irq-armada-370-xp.c
1499+
F: drivers/irqchip/irq-mvebu-*
1500+
F: drivers/rtc/rtc-armada38x.c
14991501

15001502
ARM/Marvell Berlin SoC support
15011503
M: Jisheng Zhang <jszhang@marvell.com>
@@ -1721,7 +1723,6 @@ N: rockchip
17211723
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
17221724
M: Kukjin Kim <kgene@kernel.org>
17231725
M: Krzysztof Kozlowski <krzk@kernel.org>
1724-
R: Javier Martinez Canillas <javier@osg.samsung.com>
17251726
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
17261727
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
17271728
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
@@ -1829,7 +1830,6 @@ F: drivers/edac/altera_edac.
18291830
ARM/STI ARCHITECTURE
18301831
M: Patrice Chotard <patrice.chotard@st.com>
18311832
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1832-
L: kernel@stlinux.com
18331833
W: http://www.stlinux.com
18341834
S: Maintained
18351835
F: arch/arm/mach-sti/
@@ -5622,7 +5622,7 @@ F: scripts/get_maintainer.pl
56225622

56235623
GENWQE (IBM Generic Workqueue Card)
56245624
M: Frank Haverkamp <haver@linux.vnet.ibm.com>
5625-
M: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
5625+
M: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
56265626
S: Supported
56275627
F: drivers/misc/genwqe/
56285628

@@ -5667,7 +5667,6 @@ F: tools/testing/selftests/gpio/
56675667

56685668
GPIO SUBSYSTEM
56695669
M: Linus Walleij <linus.walleij@linaro.org>
5670-
M: Alexandre Courbot <gnurou@gmail.com>
56715670
L: linux-gpio@vger.kernel.org
56725671
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
56735672
S: Maintained
@@ -7708,7 +7707,7 @@ F: drivers/platform/x86/hp_accel.c
77087707

77097708
LIVE PATCHING
77107709
M: Josh Poimboeuf <jpoimboe@redhat.com>
7711-
M: Jessica Yu <jeyu@redhat.com>
7710+
M: Jessica Yu <jeyu@kernel.org>
77127711
M: Jiri Kosina <jikos@kernel.org>
77137712
M: Miroslav Benes <mbenes@suse.cz>
77147713
R: Petr Mladek <pmladek@suse.com>
@@ -8623,7 +8622,7 @@ S: Maintained
86238622
F: drivers/media/dvb-frontends/mn88473*
86248623

86258624
MODULE SUPPORT
8626-
M: Jessica Yu <jeyu@redhat.com>
8625+
M: Jessica Yu <jeyu@kernel.org>
86278626
M: Rusty Russell <rusty@rustcorp.com.au>
86288627
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
86298628
S: Maintained
@@ -11311,7 +11310,6 @@ F: drivers/media/rc/serial_ir.c
1131111310

1131211311
STI CEC DRIVER
1131311312
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
11314-
L: kernel@stlinux.com
1131511313
S: Maintained
1131611314
F: drivers/staging/media/st-cec/
1131711315
F: Documentation/devicetree/bindings/media/stih-cec.txt
@@ -11821,6 +11819,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
1182111819
S: Supported
1182211820
F: arch/arm/mach-davinci/
1182311821
F: drivers/i2c/busses/i2c-davinci.c
11822+
F: arch/arm/boot/dts/da850*
1182411823

1182511824
TI DAVINCI SERIES MEDIA DRIVER
1182611825
M: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
@@ -13904,7 +13903,7 @@ S: Odd fixes
1390413903
F: drivers/net/wireless/wl3501*
1390513904

1390613905
WOLFSON MICROELECTRONICS DRIVERS
13907-
L: patches@opensource.wolfsonmicro.com
13906+
L: patches@opensource.cirrus.com
1390813907
T: git https://github.com/CirrusLogic/linux-drivers.git
1390913908
W: https://github.com/CirrusLogic/linux-drivers/wiki
1391013909
S: Supported

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 12
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
4+
EXTRAVERSION = -rc5
55
NAME = Fearless Coyote
66

77
# *DOCUMENTATION*

‎arch/arm/boot/dts/bcm283x.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
#include <dt-bindings/clock/bcm2835-aux.h>
44
#include <dt-bindings/gpio/gpio.h>
55

6+
/* firmware-provided startup stubs live here, where the secondary CPUs are
7+
* spinning.
8+
*/
9+
/memreserve/ 0x00000000 0x00001000;
10+
611
/* This include file covers the common peripherals and configuration between
712
* bcm2835 and bcm2836 implementations, leaving the CPU configuration to
813
* bcm2835.dtsi and bcm2836.dtsi.

‎arch/arm/boot/dts/keystone-k2l-netcp.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ netcp: netcp@26000000 {
137137
/* NetCP address range */
138138
ranges = <0 0x26000000 0x1000000>;
139139

140-
clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>, <&clkosr>;
141-
clock-names = "pa_clk", "ethss_clk", "cpts", "osr_clk";
140+
clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>;
141+
clock-names = "pa_clk", "ethss_clk", "cpts";
142142
dma-coherent;
143143

144144
ti,navigator-dmas = <&dma_gbe 0>,

‎arch/arm/boot/dts/keystone-k2l.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,14 @@
232232
};
233233
};
234234

235+
osr: sram@70000000 {
236+
compatible = "mmio-sram";
237+
reg = <0x70000000 0x10000>;
238+
#address-cells = <1>;
239+
#size-cells = <1>;
240+
clocks = <&clkosr>;
241+
};
242+
235243
dspgpio0: keystone_dsp_gpio@02620240 {
236244
compatible = "ti,keystone-dsp-gpio";
237245
gpio-controller;

‎arch/arm/boot/dts/versatile-pb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <versatile-ab.dts>
1+
#include "versatile-ab.dts"
22

33
/ {
44
model = "ARM Versatile PB";

‎arch/arm/include/asm/device.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ struct dev_archdata {
1919
#ifdef CONFIG_XEN
2020
const struct dma_map_ops *dev_dma_ops;
2121
#endif
22-
bool dma_coherent;
22+
unsigned int dma_coherent:1;
23+
unsigned int dma_ops_setup:1;
2324
};
2425

2526
struct omap_device;

‎arch/arm/kvm/init.S

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,15 @@ __do_hyp_init:
104104
@ - Write permission implies XN: disabled
105105
@ - Instruction cache: enabled
106106
@ - Data/Unified cache: enabled
107-
@ - Memory alignment checks: enabled
108107
@ - MMU: enabled (this code must be run from an identity mapping)
109108
mrc p15, 4, r0, c1, c0, 0 @ HSCR
110109
ldr r2, =HSCTLR_MASK
111110
bic r0, r0, r2
112111
mrc p15, 0, r1, c1, c0, 0 @ SCTLR
113112
ldr r2, =(HSCTLR_EE | HSCTLR_FI | HSCTLR_I | HSCTLR_C)
114113
and r1, r1, r2
115-
ARM( ldr r2, =(HSCTLR_M | HSCTLR_A) )
116-
THUMB( ldr r2, =(HSCTLR_M | HSCTLR_A | HSCTLR_TE) )
114+
ARM( ldr r2, =(HSCTLR_M) )
115+
THUMB( ldr r2, =(HSCTLR_M | HSCTLR_TE) )
117116
orr r1, r1, r2
118117
orr r0, r0, r1
119118
mcr p15, 4, r0, c1, c0, 0 @ HSCR

‎arch/arm/mach-at91/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
menuconfig ARCH_AT91
22
bool "Atmel SoCs"
33
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
4+
select ARM_CPU_SUSPEND if PM
45
select COMMON_CLK_AT91
56
select GPIOLIB
67
select PINCTRL

‎arch/arm/mach-davinci/pm.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,19 @@ int __init davinci_pm_init(void)
153153
davinci_sram_suspend = sram_alloc(davinci_cpu_suspend_sz, NULL);
154154
if (!davinci_sram_suspend) {
155155
pr_err("PM: cannot allocate SRAM memory\n");
156-
return -ENOMEM;
156+
ret = -ENOMEM;
157+
goto no_sram_mem;
157158
}
158159

159160
davinci_sram_push(davinci_sram_suspend, davinci_cpu_suspend,
160161
davinci_cpu_suspend_sz);
161162

162163
suspend_set_ops(&davinci_pm_ops);
163164

165+
return 0;
166+
167+
no_sram_mem:
168+
iounmap(pm_config.ddrpsc_reg_base);
164169
no_ddrpsc_mem:
165170
iounmap(pm_config.ddrpll_reg_base);
166171
no_ddrpll_mem:

‎arch/arm/mm/dma-mapping.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2311,7 +2311,14 @@ int arm_iommu_attach_device(struct device *dev,
23112311
}
23122312
EXPORT_SYMBOL_GPL(arm_iommu_attach_device);
23132313

2314-
static void __arm_iommu_detach_device(struct device *dev)
2314+
/**
2315+
* arm_iommu_detach_device
2316+
* @dev: valid struct device pointer
2317+
*
2318+
* Detaches the provided device from a previously attached map.
2319+
* This voids the dma operations (dma_map_ops pointer)
2320+
*/
2321+
void arm_iommu_detach_device(struct device *dev)
23152322
{
23162323
struct dma_iommu_mapping *mapping;
23172324

@@ -2324,22 +2331,10 @@ static void __arm_iommu_detach_device(struct device *dev)
23242331
iommu_detach_device(mapping->domain, dev);
23252332
kref_put(&mapping->kref, release_iommu_mapping);
23262333
to_dma_iommu_mapping(dev) = NULL;
2334+
set_dma_ops(dev, NULL);
23272335

23282336
pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev));
23292337
}
2330-
2331-
/**
2332-
* arm_iommu_detach_device
2333-
* @dev: valid struct device pointer
2334-
*
2335-
* Detaches the provided device from a previously attached map.
2336-
* This voids the dma operations (dma_map_ops pointer)
2337-
*/
2338-
void arm_iommu_detach_device(struct device *dev)
2339-
{
2340-
__arm_iommu_detach_device(dev);
2341-
set_dma_ops(dev, NULL);
2342-
}
23432338
EXPORT_SYMBOL_GPL(arm_iommu_detach_device);
23442339

23452340
static const struct dma_map_ops *arm_get_iommu_dma_map_ops(bool coherent)
@@ -2379,7 +2374,7 @@ static void arm_teardown_iommu_dma_ops(struct device *dev)
23792374
if (!mapping)
23802375
return;
23812376

2382-
__arm_iommu_detach_device(dev);
2377+
arm_iommu_detach_device(dev);
23832378
arm_iommu_release_mapping(mapping);
23842379
}
23852380

@@ -2430,9 +2425,13 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
24302425
dev->dma_ops = xen_dma_ops;
24312426
}
24322427
#endif
2428+
dev->archdata.dma_ops_setup = true;
24332429
}
24342430

24352431
void arch_teardown_dma_ops(struct device *dev)
24362432
{
2433+
if (!dev->archdata.dma_ops_setup)
2434+
return;
2435+
24372436
arm_teardown_iommu_dma_ops(dev);
24382437
}

‎arch/arm64/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,10 +1084,6 @@ config SYSVIPC_COMPAT
10841084
def_bool y
10851085
depends on COMPAT && SYSVIPC
10861086

1087-
config KEYS_COMPAT
1088-
def_bool y
1089-
depends on COMPAT && KEYS
1090-
10911087
endmenu
10921088

10931089
menu "Power management options"

‎arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@
231231
cpm_crypto: crypto@800000 {
232232
compatible = "inside-secure,safexcel-eip197";
233233
reg = <0x800000 0x200000>;
234-
interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING
235-
| IRQ_TYPE_LEVEL_HIGH)>,
234+
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
236235
<GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
237236
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
238237
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@
221221
cps_crypto: crypto@800000 {
222222
compatible = "inside-secure,safexcel-eip197";
223223
reg = <0x800000 0x200000>;
224-
interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING
225-
| IRQ_TYPE_LEVEL_HIGH)>,
224+
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
226225
<GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>,
227226
<GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
228227
<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,

0 commit comments

Comments
 (0)