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

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

Merge 3.18.56 into android-3.18 



Changes in 3.18.56
	Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms"
	netem: fix skb_orphan_partial()
	dccp/tcp: do not inherit mc_list from parent
	s390/qeth: handle sysfs error during initialization
	s390/qeth: unbreak OSM and OSN support
	s390/qeth: avoid null pointer dereference on OSN
	tcp: avoid fragmenting peculiar skbs in SACK
	sctp: fix src address selection if using secondary addresses for ipv6
	sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
	tcp: eliminate negative reordering in tcp_clean_rtx_queue
	ipv6: Prevent overrun when parsing v6 header options
	ipv6: Check ip6_find_1stfragopt() return value properly.
	qmi_wwan: add another Lenovo EM74xx device ID
	ipv6: fix out of bound writes in __ip6_append_data()
	tcp: avoid fastopen API to be used on AF_UNSPEC
	sctp: fix ICMP processing if skb is non-linear
	i2c: i2c-tiny-usb: fix buffer not being DMA capable
	drm/radeon/ci: disable mclk switching for high refresh rates (v2)
	pcmcia: remove left-over %Z format
	ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430
	slub/memcg: cure the brainless abuse of sysfs attributes
	drm/gma500/psb: Actually use VBT mode when it is found
	mm/migrate: fix refcount handling when !hugepage_migration_supported()
	mlock: fix mlock count can not decrease in race condition
	xfs: Fix missed holes in SEEK_HOLE implementation
	xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff()
	xfs: fix over-copying of getbmap parameters from userspace
	xfs: handle array index overrun in xfs_dir2_leaf_readbuf()
	xfs: prevent multi-fsb dir readahead from reading random blocks
	xfs: fix up quotacheck buffer list error handling
	xfs: fix indlen accounting error on partial delalloc conversion
	xfs: bad assertion for delalloc an extent that start at i_size
	xfs: fix unaligned access in xfs_btree_visit_blocks
	Linux 3.18.56

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d3deebd6 88ff45d0

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 55

SUBLEVEL = 56

EXTRAVERSION =

NAME = Diseased Newt

drivers/char/pcmcia/cm4040_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf, 


	rc = write_sync_reg(SCR_HOST_TO_READER_START, dev);

	if (rc <= 0) {

		DEBUGP(5, dev, "write_sync_reg c=%.2Zx\n", rc);

		DEBUGP(5, dev, "write_sync_reg c=%.2zx\n", rc);

		DEBUGP(2, dev, "<- cm4040_write (failed)\n");

		if (rc == -ERESTARTSYS)

			return rc;
@@ -387,7 +387,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf, 
	for (i = 0; i < bytes_to_write; i++) {

		rc = wait_for_bulk_out_ready(dev);

		if (rc <= 0) {

			DEBUGP(5, dev, "wait_for_bulk_out_ready rc=%.2Zx\n",

			DEBUGP(5, dev, "wait_for_bulk_out_ready rc=%.2zx\n",

			       rc);

			DEBUGP(2, dev, "<- cm4040_write (failed)\n");

			if (rc == -ERESTARTSYS)
@@ -403,7 +403,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf, 
	rc = write_sync_reg(SCR_HOST_TO_READER_DONE, dev);



	if (rc <= 0) {

		DEBUGP(5, dev, "write_sync_reg c=%.2Zx\n", rc);

		DEBUGP(5, dev, "write_sync_reg c=%.2zx\n", rc);

		DEBUGP(2, dev, "<- cm4040_write (failed)\n");

		if (rc == -ERESTARTSYS)

			return rc;

drivers/gpu/drm/gma500/psb_intel_lvds.c

+11 −7
Original line number Diff line number Diff line
@@ -783,20 +783,23 @@ void psb_intel_lvds_init(struct drm_device *dev, 
		if (scan->type & DRM_MODE_TYPE_PREFERRED) {

			mode_dev->panel_fixed_mode =

			    drm_mode_duplicate(dev, scan);

			DRM_DEBUG_KMS("Using mode from DDC\n");

			goto out;	/* FIXME: check for quirks */

		}

	}



	/* Failed to get EDID, what about VBT? do we need this? */

	if (mode_dev->vbt_mode)

	if (dev_priv->lfp_lvds_vbt_mode) {

		mode_dev->panel_fixed_mode =

		    drm_mode_duplicate(dev, mode_dev->vbt_mode);

			drm_mode_duplicate(dev, dev_priv->lfp_lvds_vbt_mode);



	if (!mode_dev->panel_fixed_mode)

		if (dev_priv->lfp_lvds_vbt_mode)

			mode_dev->panel_fixed_mode =

				drm_mode_duplicate(dev,

					dev_priv->lfp_lvds_vbt_mode);

		if (mode_dev->panel_fixed_mode) {

			mode_dev->panel_fixed_mode->type |=

				DRM_MODE_TYPE_PREFERRED;

			DRM_DEBUG_KMS("Using mode from VBT\n");

			goto out;

		}

	}



	/*

	 * If we didn't get EDID, try checking if the panel is already turned
@@ -813,6 +816,7 @@ void psb_intel_lvds_init(struct drm_device *dev, 
		if (mode_dev->panel_fixed_mode) {

			mode_dev->panel_fixed_mode->type |=

			    DRM_MODE_TYPE_PREFERRED;

			DRM_DEBUG_KMS("Using pre-programmed mode\n");

			goto out;	/* FIXME: check for quirks */

		}

	}

drivers/gpu/drm/radeon/ci_dpm.c

+6 −0
Original line number Diff line number Diff line
@@ -732,6 +732,12 @@ bool ci_dpm_vblank_too_short(struct radeon_device *rdev) 
	u32 vblank_time = r600_dpm_get_vblank_time(rdev);

	u32 switch_limit = pi->mem_gddr5 ? 450 : 300;



	/* disable mclk switching if the refresh is >120Hz, even if the

        * blanking period would allow it

        */

	if (r600_dpm_get_vrefresh(rdev) > 120)

		return true;



	if (vblank_time < switch_limit)

		return true;

	else

drivers/i2c/busses/i2c-tiny-usb.c

+21 −4
Original line number Diff line number Diff line
@@ -178,22 +178,39 @@ static int usb_read(struct i2c_adapter *adapter, int cmd, 
		    int value, int index, void *data, int len)

{

	struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data;

	void *dmadata = kmalloc(len, GFP_KERNEL);

	int ret;



	if (!dmadata)

		return -ENOMEM;



	/* do control transfer */

	return usb_control_msg(dev->usb_dev, usb_rcvctrlpipe(dev->usb_dev, 0),

	ret = usb_control_msg(dev->usb_dev, usb_rcvctrlpipe(dev->usb_dev, 0),

			       cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE |

			       USB_DIR_IN, value, index, data, len, 2000);

			       USB_DIR_IN, value, index, dmadata, len, 2000);



	memcpy(data, dmadata, len);

	kfree(dmadata);

	return ret;

}



static int usb_write(struct i2c_adapter *adapter, int cmd,

		     int value, int index, void *data, int len)

{

	struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data;

	void *dmadata = kmemdup(data, len, GFP_KERNEL);

	int ret;



	if (!dmadata)

		return -ENOMEM;



	/* do control transfer */

	return usb_control_msg(dev->usb_dev, usb_sndctrlpipe(dev->usb_dev, 0),

	ret = usb_control_msg(dev->usb_dev, usb_sndctrlpipe(dev->usb_dev, 0),

			       cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE,

			       value, index, data, len, 2000);

			       value, index, dmadata, len, 2000);



	kfree(dmadata);

	return ret;

}



static void i2c_tiny_usb_free(struct i2c_tiny_usb *dev)