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

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

Merge 3.18.83 into android-3.18 



Changes in 3.18.83
	media: imon: Fix null-ptr-deref in imon_probe
	media: dib0700: fix invalid dvb_detach argument
	iscsi-target: Fix iscsi_np reset hung task during parallel delete
	extcon: palmas: Check the parent instance to prevent the NULL
	ARM: OMAP2+: Fix init for multiple quirks for the same SoC
	ARM: dts: Fix omap3 off mode pull defines
	ata: ATA_BMDMA should depend on HAS_DMA
	ata: SATA_HIGHBANK should depend on HAS_DMA
	ata: SATA_MV should depend on HAS_DMA
	drm/sti: sti_vtg: Handle return NULL error from devm_ioremap_nocache
	igb: reset the PHY before reading the PHY ID
	igb: close/suspend race in netif_device_detach
	igb: Fix hw_dbg logging in igb_update_flash_i210
	staging: rtl8188eu: fix incorrect ERROR tags from logs
	scsi: lpfc: Add missing memory barrier
	scsi: lpfc: FCoE VPort enable-disable does not bring up the VPort
	scsi: lpfc: Correct host name in symbolic_name field
	scsi: lpfc: Correct issue leading to oops during link reset
	ALSA: vx: Don't try to update capture stream before running
	ALSA: vx: Fix possible transfer overflow
	backlight: lcd: Fix race condition during register
	backlight: adp5520: Fix error handling in adp5520_bl_probe()
	gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
	ixgbe: fix AER error handling
	ixgbe: handle close/suspend race with netif_device_detach/present
	MIPS: End asm function prologue macros with .insn
	MIPS: init: Ensure reserved memory regions are not added to bootmem
	MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
	Revert "crypto: xts - Add ECB dependency"
	Revert "uapi: fix linux/rds.h userspace compilation errors"
	uapi: fix linux/rds.h userspace compilation error
	uapi: fix linux/rds.h userspace compilation errors
	USB: usbfs: compute urb->actual_length for isochronous
	USB: Add delay-init quirk for Corsair K70 LUX keyboards
	USB: serial: qcserial: add pid/vid for Sierra Wireless EM7355 fw update
	USB: serial: garmin_gps: fix memory leak on failed URB submit
	USB: serial: garmin_gps: fix I/O after failed probe and remove
	USB: serial: garmin_gps: fix memory leak on probe errors
	Linux 3.18.83

Change-Id: I492c85e9db9ed93ab6efa7baaf1fe090bf8c880f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 356791cb c35c375e

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 82

SUBLEVEL = 83

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mach-omap2/pdata-quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ static void pdata_quirks_check(struct pdata_init *quirks) 
		if (of_machine_is_compatible(quirks->compatible)) {

			if (quirks->fn)

				quirks->fn();

			break;

		}

		quirks++;

	}

arch/mips/include/asm/asm.h

+6 −4
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ 
		.align	2;				\

		.type	symbol, @function;		\

		.ent	symbol, 0;			\

symbol:		.frame	sp, 0, ra

symbol:		.frame	sp, 0, ra;			\

		.insn



/*

 * NESTED - declare nested routine entry point
@@ -64,7 +65,8 @@ symbol: .frame sp, 0, ra 
		.align	2;				\

		.type	symbol, @function;		\

		.ent	symbol, 0;			\

symbol:		.frame	sp, framesize, rpc

symbol:		.frame	sp, framesize, rpc;		\

		.insn



/*

 * END - mark end of function
@@ -86,7 +88,7 @@ symbol: 
#define FEXPORT(symbol)					\

		.globl	symbol;				\

		.type	symbol, @function;		\

symbol:

symbol:		.insn



/*

 * ABS - export absolute symbol

arch/mips/kernel/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -427,6 +427,10 @@ static void __init bootmem_init(void) 
			continue;

		default:

			/* Not usable memory */

			if (start > min_low_pfn && end < max_low_pfn)

				reserve_bootmem(boot_mem_map.map[i].addr,

						boot_mem_map.map[i].size,

						BOOTMEM_DEFAULT);

			continue;

		}

arch/mips/netlogic/common/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ asmlinkage void plat_irq_dispatch(void) 
	do_IRQ(nlm_irq_to_xirq(node, i));

}



#ifdef CONFIG_OF

#ifdef CONFIG_CPU_XLP

static const struct irq_domain_ops xlp_pic_irq_domain_ops = {

	.xlate = irq_domain_xlate_onetwocell,

};
@@ -348,7 +348,7 @@ void __init arch_init_irq(void) 
#if defined(CONFIG_CPU_XLR)

	nlm_setup_fmn_irq();

#endif

#if defined(CONFIG_OF)

#ifdef CONFIG_CPU_XLP

	of_irq_init(xlp_pic_irq_ids);

#endif

}