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

Commit c4315910 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-q.147 (5c8d069c) into msm-4.14"

parents e942c110 fbbfccc5

Makefile

+4 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 146

SUBLEVEL = 147

EXTRAVERSION =

NAME = Petit Gorille
@@ -1040,9 +1040,11 @@ mod_sign_cmd = true 
endif

export mod_sign_cmd



HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)



ifdef CONFIG_STACK_VALIDATION

  has_libelf := $(call try-run,\

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)

  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

arch/arm/boot/dts/exynos5420-peach-pit.dts

+1 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ 
				regulator-name = "vdd_ldo10";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

arch/arm/boot/dts/exynos5800-peach-pi.dts

+1 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ 
				regulator-name = "vdd_ldo10";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

arch/arm/boot/dts/imx7d-cl-som-imx7.dts

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
			  <&clks IMX7D_ENET1_TIME_ROOT_CLK>;

	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;

	assigned-clock-rates = <0>, <100000000>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&ethphy0>;

	fsl,magic-packet;

	status = "okay";
@@ -69,7 +69,7 @@ 
			  <&clks IMX7D_ENET2_TIME_ROOT_CLK>;

	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;

	assigned-clock-rates = <0>, <100000000>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&ethphy1>;

	fsl,magic-packet;

	status = "okay";

arch/arm/mach-zynq/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int zynq_cpun_start(u32 address, int cpu) 
			* 0x4: Jump by mov instruction

			* 0x8: Jumping address

			*/

			memcpy((__force void *)zero, &zynq_secondary_trampoline,

			memcpy_toio(zero, &zynq_secondary_trampoline,

							trampoline_size);

			writel(address, zero + trampoline_size);