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

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

Merge 3.18.98 into android-3.18 



Changes in 3.18.98
	ipv6: Skip XFRM lookup if dst_entry in socket cache is valid
	hrtimer: Ensure POSIX compliance (relative CLOCK_REALTIME hrtimers)
	mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM
	ipv6: icmp6: Allow icmp messages to be looped back
	sget(): handle failures of register_shrinker()
	spi: atmel: fixed spin_lock usage inside atmel_spi_remove
	net: arc_emac: fix arc_emac_rx() error paths
	scsi: storvsc: Fix scsi_cmd error assignments in storvsc_handle_error
	tg3: Add workaround to restrict 5762 MRRS to 2048
	tg3: Enable PHY reset in MTU change path for 5720
	bnx2x: Improve reliability in case of nested PCI errors
	led: core: Fix brightness setting when setting delay_off=0
	s390/dasd: fix wrongly assigned configuration data
	xfs: quota: fix missed destroy of qi_tree_lock
	xfs: quota: check result of register_shrinker()
	e1000: fix disabling already-disabled warning
	drm/ttm: check the return value of kzalloc
	xen-netfront: enable device after manual module load
	mdio-sun4i: Fix a memory leak
	SolutionEngine771x: fix Ether platform data
	xen/gntdev: Fix off-by-one error when unmapping with holes
	xen/gntdev: Fix partial gntdev_mmap() cleanup
	sctp: make use of pre-calculated len
	net: gianfar_ptp: move set_fipers() to spinlock protecting area
	Linux 3.18.98

Change-Id: I8f1de1074eb6d176aca070cdb76367db89d5266b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e99d65f7 7c017f89

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 97

SUBLEVEL = 98

EXTRAVERSION =

NAME = Diseased Newt

arch/sh/boards/mach-se/770x/setup.c

+8 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/sh_eth.h>

#include <mach-se/mach/se.h>

#include <mach-se/mach/mrshpc.h>

#include <asm/machvec.h>
@@ -114,6 +115,11 @@ static struct platform_device heartbeat_device = { 
#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\

	defined(CONFIG_CPU_SUBTYPE_SH7712)

/* SH771X Ethernet driver */

static struct sh_eth_plat_data sh_eth_plat = {

	.phy = PHY_ID,

	.phy_interface = PHY_INTERFACE_MODE_MII,

};



static struct resource sh_eth0_resources[] = {

	[0] = {

		.start = SH_ETH0_BASE,
@@ -131,7 +137,7 @@ static struct platform_device sh_eth0_device = { 
	.name = "sh771x-ether",

	.id = 0,

	.dev = {

		.platform_data = PHY_ID,

		.platform_data = &sh_eth_plat,

	},

	.num_resources = ARRAY_SIZE(sh_eth0_resources),

	.resource = sh_eth0_resources,
@@ -154,7 +160,7 @@ static struct platform_device sh_eth1_device = { 
	.name = "sh771x-ether",

	.id = 1,

	.dev = {

		.platform_data = PHY_ID,

		.platform_data = &sh_eth_plat,

	},

	.num_resources = ARRAY_SIZE(sh_eth1_resources),

	.resource = sh_eth1_resources,

drivers/gpu/drm/ttm/ttm_page_alloc.c

+2 −0
Original line number Diff line number Diff line
@@ -818,6 +818,8 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) 
	pr_info("Initializing pool allocator\n");



	_manager = kzalloc(sizeof(*_manager), GFP_KERNEL);

	if (!_manager)

		return -ENOMEM;



	ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc");

drivers/leds/led-core.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void led_blink_set(struct led_classdev *led_cdev, 
		   unsigned long *delay_on,

		   unsigned long *delay_off)

{

	del_timer_sync(&led_cdev->blink_timer);

	led_stop_software_blink(led_cdev);



	led_cdev->flags &= ~LED_BLINK_ONESHOT;

	led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+3 −3
Original line number Diff line number Diff line
@@ -1025,9 +1025,6 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip, 
		return ret;

	}



	/* handle the block mark swapping */

	block_mark_swapping(this, payload_virt, auxiliary_virt);



	/* Loop over status bytes, accumulating ECC status. */

	status = auxiliary_virt + nfc_geo->auxiliary_status_offset;
@@ -1043,6 +1040,9 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip, 
		max_bitflips = max_t(unsigned int, max_bitflips, *status);

	}



	/* handle the block mark swapping */

	block_mark_swapping(this, buf, auxiliary_virt);



	if (oob_required) {

		/*

		 * It's time to deliver the OOB bytes. See gpmi_ecc_read_oob()