Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fcfb086 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.120 (d63fdf61) into msm-4.4"

parents 65b05aea 22397c47

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 118

SUBLEVEL = 120

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/ls1021a-qds.dts

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ 
				reg = <0x2a>;

				VDDA-supply = <&reg_3p3v>;

				VDDIO-supply = <&reg_3p3v>;

				clocks = <&sys_mclk 1>;

				clocks = <&sys_mclk>;

			};

		};

	};

arch/arm/boot/dts/ls1021a-twr.dts

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
		reg = <0x0a>;

		VDDA-supply = <&reg_3p3v>;

		VDDIO-supply = <&reg_3p3v>;

		clocks = <&sys_mclk 1>;

		clocks = <&sys_mclk>;

	};

};

arch/arm/lib/csumpartialcopyuser.S

+4 −0
Original line number Diff line number Diff line
@@ -85,7 +85,11 @@ 
		.pushsection .text.fixup,"ax"

		.align	4

9001:		mov	r4, #-EFAULT

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

		ldr	r5, [sp, #9*4]		@ *err_ptr

#else

		ldr	r5, [sp, #8*4]		@ *err_ptr

#endif

		str	r4, [r5]

		ldmia	sp, {r1, r2}		@ retrieve dst, len

		add	r2, r2, r1

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static const char *handler[]= { 
	"Error"

};



int show_unhandled_signals = 1;

int show_unhandled_signals = 0;



/*

 * Dump out the contents of some memory nicely...