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

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

Merge 4.14.109 into android-4.14 



Changes in 4.14.109
	mmc: pxamci: fix enum type confusion
	drm/vmwgfx: Don't double-free the mode stored in par->set_mode
	iommu/amd: fix sg->dma_address for sg->offset bigger than PAGE_SIZE
	libceph: wait for latest osdmap in ceph_monc_blacklist_add()
	udf: Fix crash on IO error during truncate
	mips: loongson64: lemote-2f: Add IRQF_NO_SUSPEND to "cascade" irqaction.
	MIPS: Ensure ELF appended dtb is relocated
	MIPS: Fix kernel crash for R6 in jump label branch function
	scsi: ibmvscsi: Protect ibmvscsi_head from concurrent modificaiton
	scsi: ibmvscsi: Fix empty event pool access during host removal
	futex: Ensure that futex address is aligned in handle_futex_death()
	perf probe: Fix getting the kernel map
	objtool: Move objtool_file struct off the stack
	ALSA: x86: Fix runtime PM for hdmi-lpe-audio
	ext4: fix NULL pointer dereference while journal is aborted
	ext4: fix data corruption caused by unaligned direct AIO
	ext4: brelse all indirect buffer in ext4_ind_remove_space()
	media: v4l2-ctrls.c/uvc: zero v4l2_event
	Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf()
	Bluetooth: Fix decrementing reference count twice in releasing socket
	Bluetooth: hci_ldisc: Initialize hci_dev before open()
	Bluetooth: hci_ldisc: Postpone HCI_UART_PROTO_READY bit set in hci_uart_set_proto()
	drm: Reorder set_property_atomic to avoid returning with an active ww_ctx
	netfilter: ebtables: remove BUGPRINT messages
	x86/unwind: Handle NULL pointer calls better in frame unwinder
	x86/unwind: Add hardcoded ORC entry for NULL
	locking/lockdep: Add debug_locks check in __lock_downgrade()
	ALSA: hda - Record the current power state before suspend/resume calls
	ALSA: hda - Enforces runtime_resume after S3 and S4 for each codec
	lib/int_sqrt: optimize small argument
	USB: core: only clean up what we allocated
	scsi: ufs: fix wrong command type of UTRD for UFSHCI v2.1
	PCI: designware-ep: dw_pcie_ep_set_msi() should only set MMC bits
	PCI: designware-ep: Read-only registers need DBI_RO_WR_EN to be writable
	PCI: endpoint: Use EPC's device in dma_alloc_coherent()/dma_free_coherent()
	rtc: Fix overflow when converting time64_t to rtc_time
	sched/cpufreq/schedutil: Fix error path mutex unlock
	pwm-backlight: Enable/disable the PWM before/after LCD enable toggle.
	power: supply: charger-manager: Fix incorrect return value
	ath10k: avoid possible string overflow
	Linux 4.14.109

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 74011733 1848c32f

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 108

SUBLEVEL = 109

EXTRAVERSION =

NAME = Petit Gorille

arch/mips/include/asm/jump_label.h

+4 −4
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ 
#endif



#ifdef CONFIG_CPU_MICROMIPS

#define NOP_INSN "nop32"

#define B_INSN "b32"

#else

#define NOP_INSN "nop"

#define B_INSN "b"

#endif



static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

{

	asm_volatile_goto("1:\t" NOP_INSN "\n\t"

		"nop\n\t"

	asm_volatile_goto("1:\t" B_INSN " 2f\n\t"

		"2:\tnop\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"

		".popsection\n\t"

arch/mips/kernel/vmlinux.lds.S

+7 −5
Original line number Diff line number Diff line
@@ -140,6 +140,13 @@ SECTIONS 
	PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)

#endif



#ifdef CONFIG_MIPS_ELF_APPENDED_DTB

	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {

		*(.appended_dtb)

		KEEP(*(.appended_dtb))

	}

#endif



#ifdef CONFIG_RELOCATABLE

	. = ALIGN(4);
@@ -164,11 +171,6 @@ SECTIONS 
	__appended_dtb = .;

	/* leave space for appended DTB */

	. += 0x100000;

#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)

	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {

		*(.appended_dtb)

		KEEP(*(.appended_dtb))

	}

#endif

	/*

	 * Align to 64K in attempt to eliminate holes before the

arch/mips/loongson64/lemote-2f/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct irqaction ip6_irqaction = { 
static struct irqaction cascade_irqaction = {

	.handler = no_action,

	.name = "cascade",

	.flags = IRQF_NO_THREAD,

	.flags = IRQF_NO_THREAD | IRQF_NO_SUSPEND,

};



void __init mach_init_irq(void)

arch/x86/include/asm/unwind.h

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ struct unwind_state { 
#elif defined(CONFIG_UNWINDER_FRAME_POINTER)

	bool got_irq;

	unsigned long *bp, *orig_sp, ip;

	/*

	 * If non-NULL: The current frame is incomplete and doesn't contain a

	 * valid BP. When looking for the next frame, use this instead of the

	 * non-existent saved BP.

	 */

	unsigned long *next_bp;

	struct pt_regs *regs;

#else

	unsigned long *sp;