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

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

Merge 4.14.100 into android-4.14-p 



Changes in 4.14.100
	mtd: rawnand: gpmi: fix MX28 bus master lockup problem
	iio: adc: axp288: Fix TS-pin handling
	iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
	signal: Always notice exiting tasks
	signal: Better detection of synchronous signals
	misc: vexpress: Off by one in vexpress_syscfg_exec()
	samples: mei: use /dev/mei0 instead of /dev/mei
	debugfs: fix debugfs_rename parameter checking
	tracing: uprobes: Fix typo in pr_fmt string
	mips: cm: reprime error cause
	MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
	MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
	ARM: iop32x/n2100: fix PCI IRQ mapping
	ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
	mac80211: ensure that mgmt tx skbs have tailroom for encryption
	drm/modes: Prevent division by zero htotal
	drm/vmwgfx: Fix setting of dma masks
	drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user
	HID: debug: fix the ring buffer implementation
	Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"
	libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
	xfrm: refine validation of template and selector families
	batman-adv: Avoid WARN on net_device without parent in netns
	batman-adv: Force mac header to start of data on xmit
	perf tests attr: Fix task term values
	perf tests attr: Fix group stat tests
	perf tests attr: Make hw events optional
	uio: Reduce return paths from uio_write()
	uio: Prevent device destruction while fds are open
	uio: use request_threaded_irq instead
	uio: change to use the mutex lock instead of the spin lock
	uio: fix crash after the device is unregistered
	uio: fix wrong return value from uio_mmap()
	uio: fix possible circular locking dependency
	Revert "uio: use request_threaded_irq instead"
	Linux 4.14.100

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b952da4f 557ac4e2

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 99

SUBLEVEL = 100

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/mach-iop32x/n2100.c

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ void __init n2100_map_io(void) 
/*

 * N2100 PCI.

 */

static int __init

n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	int irq;

arch/arm/mach-tango/pm.c

+2 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/suspend.h>

#include <asm/suspend.h>

#include "smc.h"

#include "pm.h"



static int tango_pm_powerdown(unsigned long arg)

{
@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = { 
	.valid = suspend_valid_only_mem,

};



static int __init tango_pm_init(void)

void __init tango_pm_init(void)

{

	suspend_set_ops(&tango_pm_ops);

	return 0;

}
 


late_initcall(tango_pm_init);

arch/arm/mach-tango/pm.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifdef CONFIG_SUSPEND

void __init tango_pm_init(void);

#else

#define tango_pm_init NULL

#endif

arch/arm/mach-tango/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <asm/mach/arch.h>

#include <asm/hardware/cache-l2x0.h>

#include "smc.h"

#include "pm.h"



static void tango_l2c_write(unsigned long val, unsigned int reg)

{
@@ -15,4 +16,5 @@ DT_MACHINE_START(TANGO_DT, "Sigma Tango DT") 
	.dt_compat	= tango_dt_compat,

	.l2c_aux_mask	= ~0,

	.l2c_write_sec	= tango_l2c_write,

	.init_late	= tango_pm_init,

MACHINE_END