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

Commit aee6850a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.144 into android-4.14-q 



Changes in 4.14.144
	ALSA: hda - Fix potential endless loop at applying quirks
	ALSA: hda/realtek - Fix overridden device-specific initialization
	ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre
	sched/fair: Don't assign runtime for throttled cfs_rq
	drm/vmwgfx: Fix double free in vmw_recv_msg()
	powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
	xfrm: clean up xfrm protocol checks
	ip6: fix skb leak in ip6frag_expire_frag_queue()
	PCI: designware-ep: Fix find_first_zero_bit() usage
	PCI: dra7xx: Fix legacy INTD IRQ handling
	vhost/test: fix build for vhost test
	batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
	batman-adv: Only read OGM tvlv_len after buffer len check
	hv_sock: Fix hang when a connection is closed
	powerpc/64: mark start_here_multiplatform as __ref
	arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64
	scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
	clk: s2mps11: Add used attribute to s2mps11_dt_match
	kernel/module: Fix mem leak in module_add_modinfo_attrs
	vhost: make sure log_num < in_num
	Linux 4.14.144

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4d7f08a3 968722f5

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 143

SUBLEVEL = 144

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
		pinctrl-0 = <&usb30_host_drv>;

		regulator-name = "vcc_host_5v";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};
@@ -87,6 +88,7 @@ 
		pinctrl-0 = <&usb20_host_drv>;

		regulator-name = "vcc_host1_5v";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};

arch/powerpc/kernel/head_64.S

+2 −0
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ p_toc: .8byte __toc_start + 0x8000 - 0b 
/*

 * This is where the main kernel code starts.

 */

__REF

start_here_multiplatform:

	/* set up the TOC */

	bl      relative_toc
@@ -972,6 +973,7 @@ start_here_multiplatform: 
	RFI

	b	.	/* prevent speculative execution */



	.previous

	/* This is where all platforms converge execution */



start_here_common:

arch/powerpc/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -475,13 +475,14 @@ void giveup_all(struct task_struct *tsk) 
	if (!tsk->thread.regs)

		return;



	check_if_tm_restore_required(tsk);



	usermsr = tsk->thread.regs->msr;



	if ((usermsr & msr_all_available) == 0)

		return;



	msr_check_and_set(msr_all_available);

	check_if_tm_restore_required(tsk);



	WARN_ON((usermsr & MSR_VSX) && !((usermsr & MSR_FP) && (usermsr & MSR_VEC)));

drivers/clk/clk-s2mps11.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); 
 * This requires of_device_id table.  In the same time this will not change the

 * actual *device* matching so do not add .of_match_table.

 */

static const struct of_device_id s2mps11_dt_match[] = {

static const struct of_device_id s2mps11_dt_match[] __used = {

	{

		.compatible = "samsung,s2mps11-clk",

		.data = (void *)S2MPS11X,