Skip to content

Commit 6a6fbf1

Browse files
mdrjrmdrjr
committed
Merge tag 'v5.4.112' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroid-5.4.y
This is the 5.4.112 stable release Change-Id: I46d2113d5c6f1d58edc5039c896d7c2018ff59a2
2 parents 0e89938 + 8f55ad4 commit 6a6fbf1

106 files changed

Lines changed: 1087 additions & 502 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.

‎Documentation/devicetree/bindings/net/ethernet-controller.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ properties:
5151
description:
5252
Reference to an nvmem node for the MAC address
5353

54-
nvmem-cells-names:
54+
nvmem-cell-names:
5555
const: mac-address
5656

5757
phy-connection-type:

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 4
4-
SUBLEVEL = 111
4+
SUBLEVEL = 112
55
EXTRAVERSION =
66
NAME = Kleptomaniac Octopus
77

‎arch/arm/boot/dts/armada-385-turris-omnia.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@
236236
status = "okay";
237237
compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22";
238238
reg = <1>;
239+
marvell,reg-init = <3 18 0 0x4985>;
239240

240241
/* irq is connected to &pcawan pin 7 */
241242
};

‎arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@
432432
pinctrl-0 = <&pinctrl_usdhc2>;
433433
cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
434434
wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
435+
vmmc-supply = <&vdd_sd1_reg>;
435436
status = "disabled";
436437
};
437438

@@ -441,5 +442,6 @@
441442
&pinctrl_usdhc3_cdwp>;
442443
cd-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
443444
wp-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
445+
vmmc-supply = <&vdd_sd0_reg>;
444446
status = "disabled";
445447
};

‎arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
#define MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD 0x0A4 0x30C 0x000 0x0 0x0
125125
#define MX8MM_IOMUXC_SD1_CMD_GPIO2_IO1 0x0A4 0x30C 0x000 0x5 0x0
126126
#define MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0A8 0x310 0x000 0x0 0x0
127-
#define MX8MM_IOMUXC_SD1_DATA0_GPIO2_IO2 0x0A8 0x31 0x000 0x5 0x0
127+
#define MX8MM_IOMUXC_SD1_DATA0_GPIO2_IO2 0x0A8 0x310 0x000 0x5 0x0
128128
#define MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0AC 0x314 0x000 0x0 0x0
129129
#define MX8MM_IOMUXC_SD1_DATA1_GPIO2_IO3 0x0AC 0x314 0x000 0x5 0x0
130130
#define MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0B0 0x318 0x000 0x0 0x0

‎arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
#define MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD 0x0A4 0x30C 0x000 0x0 0x0
131131
#define MX8MQ_IOMUXC_SD1_CMD_GPIO2_IO1 0x0A4 0x30C 0x000 0x5 0x0
132132
#define MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0 0x0A8 0x310 0x000 0x0 0x0
133-
#define MX8MQ_IOMUXC_SD1_DATA0_GPIO2_IO2 0x0A8 0x31 0x000 0x5 0x0
133+
#define MX8MQ_IOMUXC_SD1_DATA0_GPIO2_IO2 0x0A8 0x310 0x000 0x5 0x0
134134
#define MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1 0x0AC 0x314 0x000 0x0 0x0
135135
#define MX8MQ_IOMUXC_SD1_DATA1_GPIO2_IO3 0x0AC 0x314 0x000 0x5 0x0
136136
#define MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2 0x0B0 0x318 0x000 0x0 0x0

‎arch/ia64/include/asm/ptrace.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454

5555
static inline unsigned long user_stack_pointer(struct pt_regs *regs)
5656
{
57-
/* FIXME: should this be bspstore + nr_dirty regs? */
58-
return regs->ar_bspstore;
57+
return regs->r12;
5958
}
6059

6160
static inline int is_syscall_success(struct pt_regs *regs)
@@ -79,11 +78,6 @@ static inline long regs_return_value(struct pt_regs *regs)
7978
unsigned long __ip = instruction_pointer(regs); \
8079
(__ip & ~3UL) + ((__ip & 3UL) << 2); \
8180
})
82-
/*
83-
* Why not default? Because user_stack_pointer() on ia64 gives register
84-
* stack backing store instead...
85-
*/
86-
#define current_user_stack_pointer() (current_pt_regs()->r12)
8781

8882
/* given a pointer to a task_struct, return the user's pt_regs */
8983
# define task_pt_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1)

‎arch/nds32/mm/cacheflush.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ void flush_dcache_page(struct page *page)
239239
{
240240
struct address_space *mapping;
241241

242-
mapping = page_mapping(page);
242+
mapping = page_mapping_file(page);
243243
if (mapping && !mapping_mapped(mapping))
244244
set_bit(PG_dcache_dirty, &page->flags);
245245
else {

‎arch/parisc/include/asm/cmpxchg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
7272
#endif
7373
case 4: return __cmpxchg_u32((unsigned int *)ptr,
7474
(unsigned int)old, (unsigned int)new_);
75-
case 1: return __cmpxchg_u8((u8 *)ptr, (u8)old, (u8)new_);
75+
case 1: return __cmpxchg_u8((u8 *)ptr, old & 0xff, new_ & 0xff);
7676
}
7777
__cmpxchg_called_with_bad_pointer();
7878
return old;

‎arch/s390/kernel/cpcmd.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ static int diag8_noresponse(int cmdlen)
3737

3838
static int diag8_response(int cmdlen, char *response, int *rlen)
3939
{
40+
unsigned long _cmdlen = cmdlen | 0x40000000L;
41+
unsigned long _rlen = *rlen;
4042
register unsigned long reg2 asm ("2") = (addr_t) cpcmd_buf;
4143
register unsigned long reg3 asm ("3") = (addr_t) response;
42-
register unsigned long reg4 asm ("4") = cmdlen | 0x40000000L;
43-
register unsigned long reg5 asm ("5") = *rlen;
44+
register unsigned long reg4 asm ("4") = _cmdlen;
45+
register unsigned long reg5 asm ("5") = _rlen;
4446

4547
asm volatile(
4648
" diag %2,%0,0x8\n"

0 commit comments

Comments
 (0)