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

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

Merge 3.18.87 into android-3.18 



Changes in 3.18.87
	bcache: only permit to recovery read error when cache device is clean
	bcache: recover data from backing when data is clean
	serial: 8250_fintek: Fix rs485 disablement on invalid ioctl()
	spi: sh-msiof: Fix DMA transfer size check
	EDAC, sb_edac: Fix missing break in switch
	sysrq : fix Show Regs call trace on ARM
	perf test attr: Fix ignored test case result
	ARM: OMAP1: DMA: Correct the number of logical channels
	vti6: fix device register to report IFLA_INFO_KIND
	net/appletalk: Fix kernel memory disclosure
	NFSv4: Fix client recovery when server reboots multiple times
	net: sctp: fix array overrun read on sctp_timer_tbl
	tipc: fix cleanup at module unload
	mm: avoid returning VM_FAULT_RETRY from ->page_mkwrite handlers
	net: fec: fix multicast filtering hardware setup
	ima: fix hash algorithm initialization
	uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
	usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub
	serial: 8250_pci: Add Amazon PCI serial device ID
	usb: hub: Cycle HUB power when initialization fails
	USB: Increase usbfs transfer limit
	USB: devio: Prevent integer overflow in proc_do_submiturb()
	USB: usbfs: Filter flags passed in from user space
	usb: host: fix incorrect updating of offset
	Linux 3.18.87

Change-Id: Ic86fb27c91345d6b395f7d2d43dbc3aff037b83a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c2b30b43 2179863e

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 86

SUBLEVEL = 87

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mach-omap1/dma.c

+7 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <mach/irqs.h>



#define OMAP1_DMA_BASE			(0xfffed800)

#define OMAP1_LOGICAL_DMA_CH_COUNT	17



static u32 enable_1510_mode;
@@ -311,8 +310,6 @@ static int __init omap1_system_dma_init(void) 
		goto exit_iounmap;

	}



	d->lch_count		= OMAP1_LOGICAL_DMA_CH_COUNT;



	/* Valid attributes for omap1 plus processors */

	if (cpu_is_omap15xx())

		d->dev_caps = ENABLE_1510_MODE;
@@ -329,13 +326,14 @@ static int __init omap1_system_dma_init(void) 
	d->dev_caps		|= CLEAR_CSR_ON_READ;

	d->dev_caps		|= IS_WORD_16;



	if (cpu_is_omap15xx())

		d->chan_count = 9;

	else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {

		if (!(d->dev_caps & ENABLE_1510_MODE))

			d->chan_count = 16;

	/* available logical channels */

	if (cpu_is_omap15xx()) {

		d->lch_count = 9;

	} else {

		if (d->dev_caps & ENABLE_1510_MODE)

			d->lch_count = 9;

		else

			d->chan_count = 9;

			d->lch_count = 16;

	}



	p = dma_plat_info;

drivers/edac/sb_edac.c

+1 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,7 @@ static int ibridge_mci_bind_devs(struct mem_ctl_info *mci, 
			break;

		case PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA:

			pvt->pci_ta = pdev;

			break;

		case PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_RAS:

			pvt->pci_ras = pdev;

			break;

drivers/md/bcache/request.c

+8 −1
Original line number Diff line number Diff line
@@ -706,7 +706,14 @@ static void cached_dev_read_error(struct closure *cl) 
	struct search *s = container_of(cl, struct search, cl);

	struct bio *bio = &s->bio.bio;



	if (s->recoverable) {

	/*

	 * If read request hit dirty data (s->read_dirty_data is true),

	 * then recovery a failed read request from cached device may

	 * get a stale data back. So read failure recovery is only

	 * permitted when read request hit clean data in cache device,

	 * or when cache read race happened.

	 */

	if (s->recoverable && !s->read_dirty_data) {

		/* Retry from the backing device: */

		trace_bcache_read_retry(s->orig_bio);

drivers/net/appletalk/ipddp.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev) 
 */

static int ipddp_create(struct ipddp_route *new_rt)

{

        struct ipddp_route *rt = kmalloc(sizeof(*rt), GFP_KERNEL);

        struct ipddp_route *rt = kzalloc(sizeof(*rt), GFP_KERNEL);



        if (rt == NULL)

                return -ENOMEM;