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

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

Merge 4.4.186 into android-4.4 



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

Change-Id: Ie2eb68e394f94310d144fdba04d7ebfb3cb63cb7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 17bd9a7f a3e421fb

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)