Skip to content

Commit 5e58052

Browse files
airliedairlied
committed
Backmerge tag 'v4.7' into drm-next
Linux 4.7 As requested by Daniel Vetter as the conflicts were getting messy.
2 parents c11dea5 + 523d939 commit 5e58052

File tree

555 files changed

+5376
-3035
lines changed

Some content is hidden

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

555 files changed

+5376
-3035
lines changed

‎Documentation/gdb-kernel-debugging.txt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,27 +139,6 @@ Examples of using the Linux-provided gdb helpers
139139
start_comm = "swapper/2\000\000\000\000\000\000"
140140
}
141141

142-
o Dig into a radix tree data structure, such as the IRQ descriptors:
143-
(gdb) print (struct irq_desc)$lx_radix_tree_lookup(irq_desc_tree, 18)
144-
$6 = {
145-
irq_common_data = {
146-
state_use_accessors = 67584,
147-
handler_data = 0x0 <__vectors_start>,
148-
msi_desc = 0x0 <__vectors_start>,
149-
affinity = {{
150-
bits = {65535}
151-
}}
152-
},
153-
irq_data = {
154-
mask = 0,
155-
irq = 18,
156-
hwirq = 27,
157-
common = 0xee803d80,
158-
chip = 0xc0eb0854 <gic_data>,
159-
domain = 0xee808000,
160-
parent_data = 0x0 <__vectors_start>,
161-
chip_data = 0xc0eb0854 <gic_data>
162-
} <... trimmed ...>
163142

164143
List of commands and functions
165144
------------------------------

‎Documentation/x86/intel_mpx.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ is how we expect the compiler, application and kernel to work together.
4545
MPX-instrumented.
4646
3) The kernel detects that the CPU has MPX, allows the new prctl() to
4747
succeed, and notes the location of the bounds directory. Userspace is
48-
expected to keep the bounds directory at that locationWe note it
48+
expected to keep the bounds directory at that location. We note it
4949
instead of reading it each time because the 'xsave' operation needed
5050
to access the bounds directory register is an expensive operation.
5151
4) If the application needs to spill bounds out of the 4 registers, it
@@ -167,7 +167,7 @@ If a #BR is generated due to a bounds violation caused by MPX.
167167
We need to decode MPX instructions to get violation address and
168168
set this address into extended struct siginfo.
169169

170-
The _sigfault feild of struct siginfo is extended as follow:
170+
The _sigfault field of struct siginfo is extended as follow:
171171

172172
87 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
173173
88 struct {
@@ -240,5 +240,5 @@ them at the same bounds table.
240240
This is allowed architecturally. See more information "Intel(R) Architecture
241241
Instruction Set Extensions Programming Reference" (9.3.4).
242242

243-
However, if users did this, the kernel might be fooled in to unmaping an
243+
However, if users did this, the kernel might be fooled in to unmapping an
244244
in-use bounds table since it does not recognize sharing.

‎Documentation/x86/tlb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ memory, it has two choices:
55
from areas other than the one we are trying to flush will be
66
destroyed and must be refilled later, at some cost.
77
2. Use the invlpg instruction to invalidate a single page at a
8-
time. This could potentialy cost many more instructions, but
8+
time. This could potentially cost many more instructions, but
99
it is a much more precise operation, causing no collateral
1010
damage to other TLB entries.
1111

@@ -19,7 +19,7 @@ Which method to do depends on a few things:
1919
work.
2020
3. The size of the TLB. The larger the TLB, the more collateral
2121
damage we do with a full flush. So, the larger the TLB, the
22-
more attrative an individual flush looks. Data and
22+
more attractive an individual flush looks. Data and
2323
instructions have separate TLBs, as do different page sizes.
2424
4. The microarchitecture. The TLB has become a multi-level
2525
cache on modern CPUs, and the global flushes have become more

‎Documentation/x86/x86_64/machinecheck

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ between all CPUs.
3636

3737
check_interval
3838
How often to poll for corrected machine check errors, in seconds
39-
(Note output is hexademical). Default 5 minutes. When the poller
39+
(Note output is hexadecimal). Default 5 minutes. When the poller
4040
finds MCEs it triggers an exponential speedup (poll more often) on
4141
the polling interval. When the poller stops finding MCEs, it
4242
triggers an exponential backoff (poll less often) on the polling

‎MAINTAINERS

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,10 @@ S: Odd Fixes
595595
L: linux-alpha@vger.kernel.org
596596
F: arch/alpha/
597597

598+
ALPS PS/2 TOUCHPAD DRIVER
599+
R: Pali Rohár <pali.rohar@gmail.com>
600+
F: drivers/input/mouse/alps.*
601+
598602
ALTERA MAILBOX DRIVER
599603
M: Ley Foon Tan <lftan@altera.com>
600604
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@ -1698,8 +1702,6 @@ S: Maintained
16981702
F: drivers/edac/altera_edac.
16991703

17001704
ARM/STI ARCHITECTURE
1701-
M: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
1702-
M: Maxime Coquelin <maxime.coquelin@st.com>
17031705
M: Patrice Chotard <patrice.chotard@st.com>
17041706
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
17051707
L: kernel@stlinux.com
@@ -1732,6 +1734,7 @@ F: drivers/ata/ahci_st.c
17321734

17331735
ARM/STM32 ARCHITECTURE
17341736
M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
1737+
M: Alexandre Torgue <alexandre.torgue@st.com>
17351738
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
17361739
S: Maintained
17371740
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
@@ -4511,7 +4514,7 @@ S: Orphan
45114514
F: fs/efs/
45124515

45134516
EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
4514-
M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
4517+
M: Douglas Miller <dougmill@linux.vnet.ibm.com>
45154518
L: netdev@vger.kernel.org
45164519
S: Maintained
45174520
F: drivers/net/ethernet/ibm/ehea/
@@ -7458,7 +7461,7 @@ F: drivers/scsi/megaraid.*
74587461
F: drivers/scsi/megaraid/
74597462

74607463
MELLANOX ETHERNET DRIVER (mlx4_en)
7461-
M: Eugenia Emantayev <eugenia@mellanox.com>
7464+
M: Tariq Toukan <tariqt@mellanox.com>
74627465
L: netdev@vger.kernel.org
74637466
S: Supported
74647467
W: http://www.mellanox.com
@@ -7510,6 +7513,7 @@ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/
75107513
T: git git://git.infradead.org/linux-mtd.git
75117514
T: git git://git.infradead.org/l2-mtd.git
75127515
S: Maintained
7516+
F: Documentation/devicetree/bindings/mtd/
75137517
F: drivers/mtd/
75147518
F: include/linux/mtd/
75157519
F: include/uapi/mtd/
@@ -8997,6 +9001,7 @@ L: linux-gpio@vger.kernel.org
89979001
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
89989002
S: Maintained
89999003
F: Documentation/devicetree/bindings/pinctrl/
9004+
F: Documentation/pinctrl.txt
90009005
F: drivers/pinctrl/
90019006
F: include/linux/pinctrl/
90029007

‎Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 7
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION =
55
NAME = Psychotic Stoned Sheep
66

77
# *DOCUMENTATION*
@@ -363,11 +363,13 @@ CHECK = sparse
363363

364364
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
365365
-Wbitwise -Wno-return-void $(CF)
366+
NOSTDINC_FLAGS =
366367
CFLAGS_MODULE =
367368
AFLAGS_MODULE =
368369
LDFLAGS_MODULE =
369370
CFLAGS_KERNEL =
370371
AFLAGS_KERNEL =
372+
LDFLAGS_vmlinux =
371373
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized
372374
CFLAGS_KCOV = -fsanitize-coverage=trace-pc
373375

‎arch/arc/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ endif
6666

6767
endif
6868

69-
cflags-$(CONFIG_ARC_DW2_UNWIND) += -fasynchronous-unwind-tables
70-
7169
# By default gcc 4.8 generates dwarf4 which kernel unwinder can't grok
7270
ifeq ($(atleast_gcc48),y)
7371
cflags-$(CONFIG_ARC_DW2_UNWIND) += -gdwarf-2

‎arch/arc/kernel/stacktrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
142142
* prelogue is setup (callee regs saved and then fp set and not other
143143
* way around
144144
*/
145-
pr_warn("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");
145+
pr_warn_once("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");
146146
return 0;
147147

148148
#endif

‎arch/arm/boot/dts/armada-385-linksys.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
soc {
5959
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
6060
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
61-
MBUS_ID(0x09, 0x09) 0 0xf1100000 0x10000
62-
MBUS_ID(0x09, 0x05) 0 0xf1110000 0x10000>;
61+
MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
62+
MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
6363

6464
internal-regs {
6565

‎arch/arm/boot/dts/sun4i-a10.dtsi

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,19 @@
6565
compatible = "allwinner,simple-framebuffer",
6666
"simple-framebuffer";
6767
allwinner,pipeline = "de_be0-lcd0-hdmi";
68-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
69-
<&ahb_gates 44>, <&dram_gates 26>;
68+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
69+
<&ahb_gates 43>, <&ahb_gates 44>,
70+
<&dram_gates 26>;
7071
status = "disabled";
7172
};
7273

7374
framebuffer@1 {
7475
compatible = "allwinner,simple-framebuffer",
7576
"simple-framebuffer";
7677
allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
77-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
78-
<&ahb_gates 44>, <&ahb_gates 46>,
78+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
79+
<&ahb_gates 43>, <&ahb_gates 44>,
80+
<&ahb_gates 46>,
7981
<&dram_gates 25>, <&dram_gates 26>;
8082
status = "disabled";
8183
};
@@ -84,18 +86,19 @@
8486
compatible = "allwinner,simple-framebuffer",
8587
"simple-framebuffer";
8688
allwinner,pipeline = "de_fe0-de_be0-lcd0";
87-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,
88-
<&ahb_gates 46>, <&dram_gates 25>,
89-
<&dram_gates 26>;
89+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
90+
<&ahb_gates 44>, <&ahb_gates 46>,
91+
<&dram_gates 25>, <&dram_gates 26>;
9092
status = "disabled";
9193
};
9294

9395
framebuffer@3 {
9496
compatible = "allwinner,simple-framebuffer",
9597
"simple-framebuffer";
9698
allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";
97-
clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
98-
<&ahb_gates 44>, <&ahb_gates 46>,
99+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,
100+
<&ahb_gates 36>, <&ahb_gates 44>,
101+
<&ahb_gates 46>,
99102
<&dram_gates 5>, <&dram_gates 25>, <&dram_gates 26>;
100103
status = "disabled";
101104
};

‎arch/arm/boot/dts/sun5i-a10s.dtsi

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,26 @@
6565
compatible = "allwinner,simple-framebuffer",
6666
"simple-framebuffer";
6767
allwinner,pipeline = "de_be0-lcd0-hdmi";
68-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
69-
<&ahb_gates 44>;
68+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
69+
<&ahb_gates 43>, <&ahb_gates 44>;
7070
status = "disabled";
7171
};
7272

7373
framebuffer@1 {
7474
compatible = "allwinner,simple-framebuffer",
7575
"simple-framebuffer";
7676
allwinner,pipeline = "de_be0-lcd0";
77-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
77+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
78+
<&ahb_gates 44>;
7879
status = "disabled";
7980
};
8081

8182
framebuffer@2 {
8283
compatible = "allwinner,simple-framebuffer",
8384
"simple-framebuffer";
8485
allwinner,pipeline = "de_be0-lcd0-tve0";
85-
clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
86-
<&ahb_gates 44>;
86+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,
87+
<&ahb_gates 36>, <&ahb_gates 44>;
8788
status = "disabled";
8889
};
8990
};

‎arch/arm/boot/dts/sun5i-r8-chip.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
/ {
5454
model = "NextThing C.H.I.P.";
55-
compatible = "nextthing,chip", "allwinner,sun5i-r8";
55+
compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";
5656

5757
aliases {
5858
i2c0 = &i2c0;

‎arch/arm/boot/dts/sun7i-a20.dtsi

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,26 @@
6767
compatible = "allwinner,simple-framebuffer",
6868
"simple-framebuffer";
6969
allwinner,pipeline = "de_be0-lcd0-hdmi";
70-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
71-
<&ahb_gates 44>, <&dram_gates 26>;
70+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
71+
<&ahb_gates 43>, <&ahb_gates 44>,
72+
<&dram_gates 26>;
7273
status = "disabled";
7374
};
7475

7576
framebuffer@1 {
7677
compatible = "allwinner,simple-framebuffer",
7778
"simple-framebuffer";
7879
allwinner,pipeline = "de_be0-lcd0";
79-
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,
80-
<&dram_gates 26>;
80+
clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
81+
<&ahb_gates 44>, <&dram_gates 26>;
8182
status = "disabled";
8283
};
8384

8485
framebuffer@2 {
8586
compatible = "allwinner,simple-framebuffer",
8687
"simple-framebuffer";
8788
allwinner,pipeline = "de_be0-lcd0-tve0";
88-
clocks = <&pll5 1>,
89+
clocks = <&pll3>, <&pll5 1>,
8990
<&ahb_gates 34>, <&ahb_gates 36>, <&ahb_gates 44>,
9091
<&dram_gates 5>, <&dram_gates 26>;
9192
status = "disabled";
@@ -231,6 +232,7 @@
231232
pll3x2: pll3x2_clk {
232233
#clock-cells = <0>;
233234
compatible = "fixed-factor-clock";
235+
clocks = <&pll3>;
234236
clock-div = <1>;
235237
clock-mult = <2>;
236238
clock-output-names = "pll3-2x";
@@ -272,6 +274,7 @@
272274
pll7x2: pll7x2_clk {
273275
#clock-cells = <0>;
274276
compatible = "fixed-factor-clock";
277+
clocks = <&pll7>;
275278
clock-div = <1>;
276279
clock-mult = <2>;
277280
clock-output-names = "pll7-2x";

‎arch/arm/boot/dts/tegra30-beaver.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,7 @@
18431843

18441844
ldo5_reg: ldo5 {
18451845
regulator-name = "vddio_sdmmc,avdd_vdac";
1846-
regulator-min-microvolt = <3300000>;
1846+
regulator-min-microvolt = <1800000>;
18471847
regulator-max-microvolt = <3300000>;
18481848
regulator-always-on;
18491849
};
@@ -1914,6 +1914,7 @@
19141914

19151915
sdhci@78000000 {
19161916
status = "okay";
1917+
vqmmc-supply = <&ldo5_reg>;
19171918
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
19181919
wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
19191920
power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;

‎arch/arm/kvm/arm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
263263
kvm_timer_vcpu_terminate(vcpu);
264264
kvm_vgic_vcpu_destroy(vcpu);
265265
kvm_pmu_vcpu_destroy(vcpu);
266+
kvm_vcpu_uninit(vcpu);
266267
kmem_cache_free(kvm_vcpu_cache, vcpu);
267268
}
268269

‎arch/arm/mach-mvebu/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ CFLAGS_pmsu.o := -march=armv7-a
77
obj-$(CONFIG_MACH_MVEBU_ANY) += system-controller.o mvebu-soc-id.o
88

99
ifeq ($(CONFIG_MACH_MVEBU_V7),y)
10-
obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o pm.o pm-board.o
10+
obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o
11+
12+
obj-$(CONFIG_PM) += pm.o pm-board.o
1113
obj-$(CONFIG_SMP) += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
1214
endif
1315

1416
obj-$(CONFIG_MACH_DOVE) += dove.o
15-
obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o
17+
18+
ifeq ($(CONFIG_MACH_KIRKWOOD),y)
19+
obj-y += kirkwood.o
20+
obj-$(CONFIG_PM) += kirkwood-pm.o
21+
endif

0 commit comments

Comments
 (0)