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

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

Merge 4.14.190 into android-4.14-stable 



Changes in 4.14.190
	gpio: arizona: handle pm_runtime_get_sync failure case
	gpio: arizona: put pm_runtime in case of failure
	pinctrl: amd: fix npins for uart0 in kerncz_groups
	mac80211: allow rx of mesh eapol frames with default rx key
	scsi: scsi_transport_spi: Fix function pointer check
	xtensa: fix __sync_fetch_and_{and,or}_4 declarations
	xtensa: update *pos in cpuinfo_op.next
	drivers/net/wan/lapbether: Fixed the value of hard_header_len
	net: sky2: initialize return of gm_phy_read
	drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
	irqdomain/treewide: Keep firmware node unconditionally allocated
	SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")
	spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours
	IB/umem: fix reference count leak in ib_umem_odp_get()
	uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression
	ALSA: info: Drop WARN_ON() from buffer NULL sanity check
	ASoC: rt5670: Correct RT5670_LDO_SEL_MASK
	btrfs: fix double free on ulist after backref resolution failure
	btrfs: fix mount failure caused by race with umount
	btrfs: fix page leaks after failure to lock page for delalloc
	bnxt_en: Fix race when modifying pause settings.
	hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path
	ax88172a: fix ax88172a_unbind() failures
	net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration
	drm: sun4i: hdmi: Fix inverted HPD result
	net: smc91x: Fix possible memory leak in smc_drv_probe()
	bonding: check error value of register_netdevice() immediately
	mlxsw: destroy workqueue when trap_register in mlxsw_emad_init
	ipvs: fix the connection sync failed in some cases
	i2c: rcar: always clear ICSAR to avoid side effects
	bonding: check return value of register_netdevice() in bond_newlink()
	serial: exar: Fix GPIO configuration for Sealevel cards based on XR17V35X
	scripts/decode_stacktrace: strip basepath from all paths
	HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override
	HID: apple: Disable Fn-key key-re-mapping on clone keyboards
	dmaengine: tegra210-adma: Fix runtime PM imbalance on error
	Input: add `SW_MACHINE_COVER`
	spi: mediatek: use correct SPI_CFG2_REG MACRO
	regmap: dev_get_regmap_match(): fix string comparison
	hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow
	dmaengine: ioat setting ioat timeout as module parameter
	Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen
	usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init()
	arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP
	x86: math-emu: Fix up 'cmp' insn for clang ias
	binder: Don't use mmput() from shrinker function.
	usb: xhci-mtk: fix the failure of bandwidth allocation
	usb: xhci: Fix ASM2142/ASM3142 DMA addressing
	Revert "cifs: Fix the target file was deleted when rename failed."
	staging: wlan-ng: properly check endpoint types
	staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift
	staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support
	staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift
	staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift
	serial: 8250: fix null-ptr-deref in serial8250_start_tx()
	serial: 8250_mtk: Fix high-speed baud rates clamping
	fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins.
	vt: Reject zero-sized screen buffer size.
	Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation
	mm/memcg: fix refcount error while moving and swapping
	io-mapping: indicate mapping failure
	parisc: Add atomic64_set_release() define to avoid CPU soft lockups
	ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb
	ath9k: Fix regression with Atheros 9271
	Linux 4.14.190

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I0d395679325e47e1f916bc0aa64d6299563559f4
parents 57e7694f e5a54aa2

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 189

SUBLEVEL = 190

EXTRAVERSION =

NAME = Petit Gorille
@@ -487,7 +487,7 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y) 
$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

arch/arm64/kernel/debug-monitors.c

+2 −2
Original line number Diff line number Diff line
@@ -389,14 +389,14 @@ void user_rewind_single_step(struct task_struct *task) 
	 * If single step is active for this thread, then set SPSR.SS

	 * to 1 to avoid returning to the active-pending state.

	 */

	if (test_ti_thread_flag(task_thread_info(task), TIF_SINGLESTEP))

	if (test_tsk_thread_flag(task, TIF_SINGLESTEP))

		set_regs_spsr_ss(task_pt_regs(task));

}

NOKPROBE_SYMBOL(user_rewind_single_step);



void user_fastforward_single_step(struct task_struct *task)

{

	if (test_ti_thread_flag(task_thread_info(task), TIF_SINGLESTEP))

	if (test_tsk_thread_flag(task, TIF_SINGLESTEP))

		clear_regs_spsr_ss(task_pt_regs(task));

}

arch/parisc/include/asm/atomic.h

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ atomic64_set(atomic64_t *v, s64 i) 
	_atomic_spin_unlock_irqrestore(v, flags);

}



#define atomic64_set_release(v, i)	atomic64_set((v), (i))



static __inline__ s64

atomic64_read(const atomic64_t *v)

{

arch/x86/kernel/apic/io_apic.c

+5 −5
Original line number Diff line number Diff line
@@ -2233,12 +2233,12 @@ static int mp_irqdomain_create(int ioapic) 
	ip->irqdomain = irq_domain_create_linear(fn, hwirqs, cfg->ops,

						 (void *)(long)ioapic);



	if (!ip->irqdomain) {

		/* Release fw handle if it was allocated above */

		if (!cfg->dev)

			irq_domain_free_fwnode(fn);



	if (!ip->irqdomain)

		return -ENOMEM;

	}



	ip->irqdomain->parent = parent;

arch/x86/kernel/apic/msi.c

+11 −5
Original line number Diff line number Diff line
@@ -149,11 +149,12 @@ void __init arch_init_msi_domain(struct irq_domain *parent) 
		msi_default_domain =

			pci_msi_create_irq_domain(fn, &pci_msi_domain_info,

						  parent);

		irq_domain_free_fwnode(fn);

	}

	if (!msi_default_domain)

	if (!msi_default_domain) {

		irq_domain_free_fwnode(fn);

		pr_warn("failed to initialize irqdomain for MSI/MSI-x.\n");

	}

}



#ifdef CONFIG_IRQ_REMAP

static struct irq_chip pci_msi_ir_controller = {
@@ -185,6 +186,7 @@ struct irq_domain *arch_create_remap_msi_irq_domain(struct irq_domain *parent, 
	if (!fn)

		return NULL;

	d = pci_msi_create_irq_domain(fn, &pci_msi_ir_domain_info, parent);

	if (!d)

		irq_domain_free_fwnode(fn);

	return d;

}
@@ -248,6 +250,7 @@ static struct irq_domain *dmar_get_irq_domain(void) 
	if (fn) {

		dmar_domain = msi_create_irq_domain(fn, &dmar_msi_domain_info,

						    x86_vector_domain);

		if (!dmar_domain)

			irq_domain_free_fwnode(fn);

	}

out:
@@ -373,7 +376,10 @@ struct irq_domain *hpet_create_irq_domain(int hpet_id) 
	}



	d = msi_create_irq_domain(fn, domain_info, parent);

	if (!d) {

		irq_domain_free_fwnode(fn);

		kfree(domain_info);

	}

	return d;

}