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

Commit bc1363bd authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.100 (258c06c1) into msm-4.14 



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

Change-Id: Idcc7a8b330ce991a5d424ffe2aa7f6efbcc84b5c
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents f1b30ef9 258c06c1

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