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

Commit ae81a073 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.186 (aeb051d1) into msm-4.4 



* refs/heads/tmp-aeb051d1
  Linux 4.4.186
  KVM: x86: protect KVM_CREATE_PIT/KVM_CREATE_PIT2 with kvm->lock
  s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
  s390/qdio: (re-)initialize tiqdio list entries
  s390: fix stfle zero padding
  ARC: hide unused function unw_hdr_alloc
  kvm: x86: avoid warning on repeated KVM_SET_TSS_ADDR
  dm verity: use message limit for data block corruption message
  sis900: fix TX completion
  ppp: mppe: Add softdep to arc4
  be2net: fix link failure after ethtool offline test
  ARM: omap2: remove incorrect __init annotation
  perf/core: Fix perf_sample_regs_user() mm check
  e1000e: start network tx queue only when link is up
  MIPS: Remove superfluous check for __linux__
  VMCI: Fix integer overflow in VMCI handle arrays
  carl9170: fix misuse of device driver API
  staging: comedi: amplc_pci230: fix null pointer deref on interrupt
  staging: comedi: dt282x: fix a null pointer deref on interrupt
  usb: renesas_usbhs: add a workaround for a race condition of workqueue
  usb: gadget: ether: Fix race between gether_disconnect and rx_submit
  USB: serial: option: add support for GosunCn ME3630 RNDIS mode
  USB: serial: ftdi_sio: add ID for isodebug v1
  mwifiex: Don't abort on small, spec-compliant vendor IEs
  fscrypt: don't set policy for a dead directory
  mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
  mwifiex: Abort at too short BSS descriptor element
  x86/tls: Fix possible spectre-v1 in do_get_thread_area()
  x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
  udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
  bnx2x: Check if transceiver implements DDM before access
  md: fix for divide error in status_resync
  ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
  ARM: davinci: da850-evm: call regulator_has_full_constraints()
  Input: imx_keypad - make sure keyboard can always wake up system
  can: mcp251x: add support for mcp25625
  dt-bindings: can: mcp251x: add mcp25625 support
  mwifiex: Fix possible buffer overflows at parsing bss descriptor
  mac80211: mesh: fix RCU warning
  samples, bpf: fix to change the buffer size for read()
  Input: elantech - enable middle button support on 2 ThinkPads
  ANDROID: overlayfs ovl_create_of_link regression

Change-Id: I42190d7fc7de3f2287199a9f69bc42bcf3596ec7
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 4461eef6 aeb051d1

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
 - compatible: Should be one of the following:

   - "microchip,mcp2510" for MCP2510.

   - "microchip,mcp2515" for MCP2515.

   - "microchip,mcp25625" for MCP25625.

 - reg: SPI chip select.

 - clocks: The clock feeding the CAN controller.

 - interrupt-parent: The parent interrupt controller.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 185

SUBLEVEL = 186

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/kernel/unwind.c

+4 −5
Original line number Diff line number Diff line
@@ -183,11 +183,6 @@ static void *__init unw_hdr_alloc_early(unsigned long sz) 
				       MAX_DMA_ADDRESS);

}



static void *unw_hdr_alloc(unsigned long sz)

{

	return kmalloc(sz, GFP_KERNEL);

}



static void init_unwind_table(struct unwind_table *table, const char *name,

			      const void *core_start, unsigned long core_size,

			      const void *init_start, unsigned long init_size,
@@ -368,6 +363,10 @@ ret_err: 
}



#ifdef CONFIG_MODULES

static void *unw_hdr_alloc(unsigned long sz)

{

	return kmalloc(sz, GFP_KERNEL);

}



static struct unwind_table *last_table;

arch/arm/mach-davinci/board-da850-evm.c

+2 −0
Original line number Diff line number Diff line
@@ -1479,6 +1479,8 @@ static __init void da850_evm_init(void) 
	if (ret)

		pr_warn("%s: dsp/rproc registration failed: %d\n",

			__func__, ret);



	regulator_has_full_constraints();

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

arch/arm/mach-davinci/devices-da8xx.c

+3 −0
Original line number Diff line number Diff line
@@ -660,6 +660,9 @@ static struct platform_device da8xx_lcdc_device = { 
	.id		= 0,

	.num_resources	= ARRAY_SIZE(da8xx_lcdc_resources),

	.resource	= da8xx_lcdc_resources,

	.dev		= {

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	}

};



int __init da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata)