Skip to content

Commit 774dbdc

Browse files
arter97arter97
committed
Merge tag 'v4.14.226'
This is the 4.14.226 stable release Signed-off-by: Park Ju Hyung <[email protected]>
2 parents e454b45 + cb83ddc commit 774dbdc

File tree

586 files changed

+4647
-2301
lines changed

Some content is hidden

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

586 files changed

+4647
-2301
lines changed

Diff for: ‎Documentation/devicetree/bindings/net/btusb.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt:
3636
compatible = "usb1286,204e";
3737
reg = <1>;
3838
interrupt-parent = <&gpio0>;
39-
interrupt-name = "wakeup";
39+
interrupt-names = "wakeup";
4040
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
4141
};
4242
};

Diff for: ‎Documentation/filesystems/sysfs.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,10 @@ Other notes:
211211
is 4096.
212212

213213
- show() methods should return the number of bytes printed into the
214-
buffer. This is the return value of scnprintf().
214+
buffer.
215215

216-
- show() must not use snprintf() when formatting the value to be
217-
returned to user space. If you can guarantee that an overflow
218-
will never happen you can use sprintf() otherwise you must use
219-
scnprintf().
216+
- show() should only use sysfs_emit() or sysfs_emit_at() when formatting
217+
the value to be returned to user space.
220218

221219
- store() should return the number of bytes used from the buffer. If the
222220
entire buffer has been used, just return the count argument.

Diff for: ‎Makefile

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 214
4+
SUBLEVEL = 226
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

@@ -389,7 +389,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump
389389
AWK = awk
390390
GENKSYMS = scripts/genksyms/genksyms
391391
INSTALLKERNEL := installkernel
392-
DEPMOD = /sbin/depmod
392+
DEPMOD = depmod
393393
PERL = perl
394394
PYTHON = python
395395
CHECK = sparse
@@ -820,6 +820,13 @@ ifdef CONFIG_FUNCTION_TRACER
820820
ifndef CC_FLAGS_FTRACE
821821
CC_FLAGS_FTRACE := -pg
822822
endif
823+
ifdef CONFIG_FTRACE_MCOUNT_RECORD
824+
# gcc 5 supports generating the mcount tables directly
825+
ifeq ($(call cc-option-yn,-mrecord-mcount),y)
826+
CC_FLAGS_FTRACE += -mrecord-mcount
827+
export CC_USING_RECORD_MCOUNT := 1
828+
endif
829+
endif
823830
export CC_FLAGS_FTRACE
824831
ifdef CONFIG_HAVE_FENTRY
825832
CC_USING_FENTRY := $(call cc-option, -mfentry -DCC_USING_FENTRY)
@@ -951,12 +958,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init)
951958
# change __FILE__ to the relative path from the srctree
952959
KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
953960

954-
# ensure -fcf-protection is disabled when using retpoline as it is
955-
# incompatible with -mindirect-branch=thunk-extern
956-
ifdef CONFIG_RETPOLINE
957-
KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
958-
endif
959-
960961
# use the deterministic mode of AR if available
961962
KBUILD_ARFLAGS := $(call ar-option,D)
962963

Diff for: ‎arch/arc/Makefile

+2-7
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,9 @@ libs-y += arch/arc/lib/ $(LIBGCC)
9999

100100
boot := arch/arc/boot
101101

102-
#default target for make without any arguments.
103-
KBUILD_IMAGE := $(boot)/bootpImage
104-
105-
all: bootpImage
106-
bootpImage: vmlinux
107-
108-
boot_targets += uImage uImage.bin uImage.gz
102+
boot_targets := uImage uImage.bin uImage.gz uImage.lzma
109103

104+
PHONY += $(boot_targets)
110105
$(boot_targets): vmlinux
111106
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
112107

Diff for: ‎arch/arc/include/asm/page.h

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#ifndef __ASSEMBLY__
1414

1515
#define clear_page(paddr) memset((paddr), 0, PAGE_SIZE)
16+
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
1617
#define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
1718

1819
struct vm_area_struct;

Diff for: ‎arch/arm/boot/compressed/head.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -1090,9 +1090,9 @@ __armv4_mmu_cache_off:
10901090
__armv7_mmu_cache_off:
10911091
mrc p15, 0, r0, c1, c0
10921092
#ifdef CONFIG_MMU
1093-
bic r0, r0, #0x000d
1093+
bic r0, r0, #0x0005
10941094
#else
1095-
bic r0, r0, #0x000c
1095+
bic r0, r0, #0x0004
10961096
#endif
10971097
mcr p15, 0, r0, c1, c0 @ turn MMU and cache off
10981098
mov r12, lr

Diff for: ‎arch/arm/boot/dts/exynos3250-monk.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
s2mps14_pmic@66 {
192192
compatible = "samsung,s2mps14-pmic";
193193
interrupt-parent = <&gpx0>;
194-
interrupts = <7 IRQ_TYPE_NONE>;
194+
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
195195
reg = <0x66>;
196196
wakeup-source;
197197

Diff for: ‎arch/arm/boot/dts/exynos3250-rinato.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
s2mps14_pmic@66 {
275275
compatible = "samsung,s2mps14-pmic";
276276
interrupt-parent = <&gpx0>;
277-
interrupts = <7 IRQ_TYPE_NONE>;
277+
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
278278
reg = <0x66>;
279279
wakeup-source;
280280

Diff for: ‎arch/arm/boot/dts/exynos5250-spring.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
compatible = "samsung,s5m8767-pmic";
112112
reg = <0x66>;
113113
interrupt-parent = <&gpx3>;
114-
interrupts = <2 IRQ_TYPE_NONE>;
114+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
115115
pinctrl-names = "default";
116116
pinctrl-0 = <&s5m8767_irq &s5m8767_dvs &s5m8767_ds>;
117117
wakeup-source;

Diff for: ‎arch/arm/boot/dts/exynos5420-arndale-octa.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
reg = <0x66>;
8888

8989
interrupt-parent = <&gpx3>;
90-
interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
90+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
9191
pinctrl-names = "default";
9292
pinctrl-0 = <&s2mps11_irq>;
9393

Diff for: ‎arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278

279279
/* VDD_AUD_1P8: Audio codec */
280280
reg_aud_1p8v: ldo3 {
281-
regulator-name = "vdd1p8";
281+
regulator-name = "vdd1p8a";
282282
regulator-min-microvolt = <1800000>;
283283
regulator-max-microvolt = <1800000>;
284284
regulator-boot-on;

Diff for: ‎arch/arm/boot/dts/lpc32xx.dtsi

-3
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,6 @@
323323

324324
clocks = <&xtal_32k>, <&xtal>;
325325
clock-names = "xtal_32k", "xtal";
326-
327-
assigned-clocks = <&clk LPC32XX_CLK_HCLK_PLL>;
328-
assigned-clock-rates = <208000000>;
329326
};
330327
};
331328

Diff for: ‎arch/arm/boot/dts/omap443x.dtsi

+2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
};
3636

3737
ocp {
38+
/* 4430 has only gpio_86 tshut and no talert interrupt */
3839
bandgap: bandgap@4a002260 {
3940
reg = <0x4a002260 0x4
4041
0x4a00232C 0x4>;
4142
compatible = "ti,omap4430-bandgap";
43+
gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
4244

4345
#thermal-sensor-cells = <0>;
4446
};

Diff for: ‎arch/arm/boot/dts/picoxcell-pc3x2.dtsi

+4
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,21 @@
5454
emac: gem@30000 {
5555
compatible = "cadence,gem";
5656
reg = <0x30000 0x10000>;
57+
interrupt-parent = <&vic0>;
5758
interrupts = <31>;
5859
};
5960

6061
dmac1: dmac@40000 {
6162
compatible = "snps,dw-dmac";
6263
reg = <0x40000 0x10000>;
64+
interrupt-parent = <&vic0>;
6365
interrupts = <25>;
6466
};
6567

6668
dmac2: dmac@50000 {
6769
compatible = "snps,dw-dmac";
6870
reg = <0x50000 0x10000>;
71+
interrupt-parent = <&vic0>;
6972
interrupts = <26>;
7073
};
7174

@@ -243,6 +246,7 @@
243246
axi2pico@c0000000 {
244247
compatible = "picochip,axi2pico-pc3x2";
245248
reg = <0xc0000000 0x10000>;
249+
interrupt-parent = <&vic0>;
246250
interrupts = <13 14 15 16 17 18 19 20 21>;
247251
};
248252
};

Diff for: ‎arch/arm/kernel/signal.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -667,18 +667,20 @@ struct page *get_signal_page(void)
667667

668668
addr = page_address(page);
669669

670+
/* Poison the entire page */
671+
memset32(addr, __opcode_to_mem_arm(0xe7fddef1),
672+
PAGE_SIZE / sizeof(u32));
673+
670674
/* Give the signal return code some randomness */
671675
offset = 0x200 + (get_random_int() & 0x7fc);
672676
signal_return_offset = offset;
673677

674-
/*
675-
* Copy signal return handlers into the vector page, and
676-
* set sigreturn to be a pointer to these.
677-
*/
678+
/* Copy signal return handlers into the page */
678679
memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
679680

680-
ptr = (unsigned long)addr + offset;
681-
flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
681+
/* Flush out all instructions in this page */
682+
ptr = (unsigned long)addr;
683+
flush_icache_range(ptr, ptr + PAGE_SIZE);
682684

683685
return page;
684686
}

Diff for: ‎arch/arm/mach-footbridge/dc21285.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ dc21285_read_config(struct pci_bus *bus, unsigned int devfn, int where,
6969
if (addr)
7070
switch (size) {
7171
case 1:
72-
asm("ldrb %0, [%1, %2]"
72+
asm volatile("ldrb %0, [%1, %2]"
7373
: "=r" (v) : "r" (addr), "r" (where) : "cc");
7474
break;
7575
case 2:
76-
asm("ldrh %0, [%1, %2]"
76+
asm volatile("ldrh %0, [%1, %2]"
7777
: "=r" (v) : "r" (addr), "r" (where) : "cc");
7878
break;
7979
case 4:
80-
asm("ldr %0, [%1, %2]"
80+
asm volatile("ldr %0, [%1, %2]"
8181
: "=r" (v) : "r" (addr), "r" (where) : "cc");
8282
break;
8383
}
@@ -103,17 +103,17 @@ dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where,
103103
if (addr)
104104
switch (size) {
105105
case 1:
106-
asm("strb %0, [%1, %2]"
106+
asm volatile("strb %0, [%1, %2]"
107107
: : "r" (value), "r" (addr), "r" (where)
108108
: "cc");
109109
break;
110110
case 2:
111-
asm("strh %0, [%1, %2]"
111+
asm volatile("strh %0, [%1, %2]"
112112
: : "r" (value), "r" (addr), "r" (where)
113113
: "cc");
114114
break;
115115
case 4:
116-
asm("str %0, [%1, %2]"
116+
asm volatile("str %0, [%1, %2]"
117117
: : "r" (value), "r" (addr), "r" (where)
118118
: "cc");
119119
break;

Diff for: ‎arch/arm/mach-imx/suspend-imx6.S

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
#define MX6Q_CCM_CCR 0x0
7474

7575
.align 3
76+
.arm
7677

7778
.macro sync_l2_cache
7879

Diff for: ‎arch/arm/mach-omap2/omap_device.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,12 @@ static int _omap_device_notifier_call(struct notifier_block *nb,
224224
break;
225225
case BUS_NOTIFY_BIND_DRIVER:
226226
od = to_omap_device(pdev);
227-
if (od && (od->_state == OMAP_DEVICE_STATE_ENABLED) &&
228-
pm_runtime_status_suspended(dev)) {
227+
if (od) {
229228
od->_driver_status = BUS_NOTIFY_BIND_DRIVER;
230-
pm_runtime_set_active(dev);
229+
if (od->_state == OMAP_DEVICE_STATE_ENABLED &&
230+
pm_runtime_status_suspended(dev)) {
231+
pm_runtime_set_active(dev);
232+
}
231233
}
232234
break;
233235
case BUS_NOTIFY_ADD_DEVICE:

Diff for: ‎arch/arm/xen/enlighten.c

-2
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,6 @@ static int __init xen_guest_init(void)
392392
return -ENOMEM;
393393
}
394394
gnttab_init();
395-
if (!xen_initial_domain())
396-
xenbus_probe(NULL);
397395

398396
/*
399397
* Making sure board specific code will not set up ops for

Diff for: ‎arch/arm/xen/p2m.c

+31-2
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,39 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
9191
int i;
9292

9393
for (i = 0; i < count; i++) {
94+
struct gnttab_unmap_grant_ref unmap;
95+
int rc;
96+
9497
if (map_ops[i].status)
9598
continue;
96-
set_phys_to_machine(map_ops[i].host_addr >> XEN_PAGE_SHIFT,
97-
map_ops[i].dev_bus_addr >> XEN_PAGE_SHIFT);
99+
if (likely(set_phys_to_machine(map_ops[i].host_addr >> XEN_PAGE_SHIFT,
100+
map_ops[i].dev_bus_addr >> XEN_PAGE_SHIFT)))
101+
continue;
102+
103+
/*
104+
* Signal an error for this slot. This in turn requires
105+
* immediate unmapping.
106+
*/
107+
map_ops[i].status = GNTST_general_error;
108+
unmap.host_addr = map_ops[i].host_addr,
109+
unmap.handle = map_ops[i].handle;
110+
map_ops[i].handle = ~0;
111+
if (map_ops[i].flags & GNTMAP_device_map)
112+
unmap.dev_bus_addr = map_ops[i].dev_bus_addr;
113+
else
114+
unmap.dev_bus_addr = 0;
115+
116+
/*
117+
* Pre-populate the status field, to be recognizable in
118+
* the log message below.
119+
*/
120+
unmap.status = 1;
121+
122+
rc = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
123+
&unmap, 1);
124+
if (rc || unmap.status != GNTST_okay)
125+
pr_err_once("gnttab unmap failed: rc=%d st=%d\n",
126+
rc, unmap.status);
98127
}
99128

100129
return 0;

Diff for: ‎arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
s2mps13-pmic@66 {
344344
compatible = "samsung,s2mps13-pmic";
345345
interrupt-parent = <&gpa0>;
346-
interrupts = <7 IRQ_TYPE_NONE>;
346+
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
347347
reg = <0x66>;
348348
samsung,s2mps11-wrstbi-ground;
349349

Diff for: ‎arch/arm64/boot/dts/exynos/exynos7-espresso.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
s2mps15_pmic@66 {
8989
compatible = "samsung,s2mps15-pmic";
9090
reg = <0x66>;
91-
interrupts = <2 IRQ_TYPE_NONE>;
91+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
9292
interrupt-parent = <&gpa0>;
9393
pinctrl-names = "default";
9494
pinctrl-0 = <&pmic_irq>;

Diff for: ‎arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304

305305
dcfg: dcfg@1ee0000 {
306306
compatible = "fsl,ls1046a-dcfg", "syscon";
307-
reg = <0x0 0x1ee0000 0x0 0x10000>;
307+
reg = <0x0 0x1ee0000 0x0 0x1000>;
308308
big-endian;
309309
};
310310

Diff for: ‎arch/arm64/boot/dts/nvidia/tegra210.dtsi

+1
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,7 @@
810810
<&tegra_car 128>, /* hda2hdmi */
811811
<&tegra_car 111>; /* hda2codec_2x */
812812
reset-names = "hda", "hda2hdmi", "hda2codec_2x";
813+
power-domains = <&pd_sor>;
813814
status = "disabled";
814815
};
815816

Diff for: ‎arch/arm64/boot/dts/qcom/msm8916.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
no-map;
6464
};
6565

66-
reserved@8668000 {
66+
reserved@86680000 {
6767
reg = <0x0 0x86680000 0x0 0x80000>;
6868
no-map;
6969
};
@@ -73,7 +73,7 @@
7373
no-map;
7474
};
7575

76-
rfsa@867e00000 {
76+
rfsa@867e0000 {
7777
reg = <0x0 0x867e0000 0x0 0x20000>;
7878
no-map;
7979
};

0 commit comments

Comments
 (0)