Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/… · TinkerBoard/debian_kernel@5ed6b09 · GitHub
Skip to content

Commit 5ed6b09

Browse files
rkhuangtaorkhuangtao
committed
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (434 commits) Linux 4.4.52 kvm: vmx: ensure VMCS is current while enabling PML Revert "usb: chipidea: imx: enable CI_HDRC_SET_NON_ZERO_TTHA" rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down block: fix double-free in the failure path of cgwb_bdi_init() goldfish: Sanitize the broken interrupt handler x86/platform/goldfish: Prevent unconditional loading USB: serial: ark3116: fix register-accessor error handling USB: serial: opticon: fix CTS retrieval at open USB: serial: spcp8x5: fix modem-status handling USB: serial: ftdi_sio: fix line-status over-reporting USB: serial: ftdi_sio: fix extreme low-latency setting USB: serial: ftdi_sio: fix modem-status error handling USB: serial: cp210x: add new IDs for GE Bx50v3 boards USB: serial: mos7840: fix another NULL-deref at open tty: serial: msm: Fix module autoload net: socket: fix recvmmsg not returning error from sock_error ip: fix IP_CHECKSUM handling irda: Fix lockdep annotations in hashbin_delete(). dccp: fix freeing skb too early for IPV6_RECVPKTINFO ... Conflicts: drivers/mmc/core/mmc.c drivers/usb/dwc3/ep0.c drivers/usb/host/xhci.h Change-Id: Icf331a68162ab686d01996a3f43fa2e97543f62e
2 parents 3f083a5 + 4304568 commit 5ed6b09

401 files changed

Lines changed: 4870 additions & 1976 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/clock/imx31-clock.txt‎

Lines changed: 1 addition & 1 deletion

‎Documentation/kernel-parameters.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
12611261
When zero, profiling data is discarded and associated
12621262
debugfs files are removed at module unload time.
12631263

1264+
goldfish [X86] Enable the goldfish android emulator platform.
1265+
Don't use this when you are not running on the
1266+
android emulator
1267+
12641268
gpt [EFI] Forces disk with valid GPT signature but
12651269
invalid Protective MBR to be treated as GPT. If the
12661270
primary GPT is corrupted, it enables the backup/alternate

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 41
3+
SUBLEVEL = 52
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎android/configs/android-recommended.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# CONFIG_VT is not set
99
CONFIG_ANDROID_TIMED_GPIO=y
1010
CONFIG_ARM_KERNMEM_PERMS=y
11+
CONFIG_ARM64_SW_TTBR0_PAN=y
1112
CONFIG_BACKLIGHT_LCD_SUPPORT=y
1213
CONFIG_BLK_DEV_LOOP=y
1314
CONFIG_BLK_DEV_RAM=y

‎arch/arc/include/asm/delay.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ static inline void __delay(unsigned long loops)
2626
" lp 1f \n"
2727
" nop \n"
2828
"1: \n"
29-
: : "r"(loops));
29+
:
30+
: "r"(loops)
31+
: "lp_count");
3032
}
3133

3234
extern void __bad_udelay(void);

‎arch/arc/kernel/unaligned.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,9 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,
241241
if (state.fault)
242242
goto fault;
243243

244+
/* clear any remanants of delay slot */
244245
if (delay_mode(regs)) {
245-
regs->ret = regs->bta;
246+
regs->ret = regs->bta & ~1U;
246247
regs->status32 &= ~STATUS_DE_MASK;
247248
} else {
248249
regs->ret += state.instr_len;

‎arch/arm/boot/dts/da850-evm.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
#size-cells = <1>;
8686
compatible = "m25p64";
8787
spi-max-frequency = <30000000>;
88+
m25p,fast-read;
8889
reg = <0>;
8990
partition@0 {
9091
label = "U-Boot-SPL";

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
};
3131
};
3232

33-
avic: avic-interrupt-controller@60000000 {
33+
avic: interrupt-controller@68000000 {
3434
compatible = "fsl,imx31-avic", "fsl,avic";
3535
interrupt-controller;
3636
#interrupt-cells = <1>;
37-
reg = <0x60000000 0x100000>;
37+
reg = <0x68000000 0x100000>;
3838
};
3939

4040
soc {
@@ -110,13 +110,6 @@
110110
interrupts = <19>;
111111
clocks = <&clks 25>;
112112
};
113-
114-
clks: ccm@53f80000{
115-
compatible = "fsl,imx31-ccm";
116-
reg = <0x53f80000 0x4000>;
117-
interrupts = <0 31 0x04 0 53 0x04>;
118-
#clock-cells = <1>;
119-
};
120113
};
121114

122115
aips@53f00000 { /* AIPS2 */
@@ -126,6 +119,13 @@
126119
reg = <0x53f00000 0x100000>;
127120
ranges;
128121

122+
clks: ccm@53f80000{
123+
compatible = "fsl,imx31-ccm";
124+
reg = <0x53f80000 0x4000>;
125+
interrupts = <31>, <53>;
126+
#clock-cells = <1>;
127+
};
128+
129129
gpt: timer@53f90000 {
130130
compatible = "fsl,imx31-gpt";
131131
reg = <0x53f90000 0x4000>;

‎arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@
319319
compatible = "fsl,imx6q-nitrogen6_max-sgtl5000",
320320
"fsl,imx-audio-sgtl5000";
321321
model = "imx6q-nitrogen6_max-sgtl5000";
322-
pinctrl-names = "default";
323-
pinctrl-0 = <&pinctrl_sgtl5000>;
324322
ssi-controller = <&ssi1>;
325323
audio-codec = <&codec>;
326324
audio-routing =
@@ -401,6 +399,8 @@
401399

402400
codec: sgtl5000@0a {
403401
compatible = "fsl,sgtl5000";
402+
pinctrl-names = "default";
403+
pinctrl-0 = <&pinctrl_sgtl5000>;
404404
reg = <0x0a>;
405405
clocks = <&clks 201>;
406406
VDDA-supply = <&reg_2p5v>;

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

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)