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

Commit e26d8b2c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.110 (00a0bcbf) into msm-4.9"

parents 192abd85 a237e18f

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
      "brcm,bcm53128"

      "brcm,bcm5365"

      "brcm,bcm5395"

      "brcm,bcm5389"

      "brcm,bcm5397"

      "brcm,bcm5398"

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 109

SUBLEVEL = 110

EXTRAVERSION =

NAME = Roaring Lionus

drivers/ata/libata-core.c

+0 −3
Original line number Diff line number Diff line
@@ -4426,9 +4426,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },



	/* Sandisk devices which are known to not handle LPM well */

	{ "SanDisk SD7UB3Q*G1001",	NULL,	ATA_HORKAGE_NOLPM, },



	/* devices that don't properly handle queued TRIM commands */

	{ "Micron_M500IT_*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

drivers/ata/libata-zpodd.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct zpodd { 
static int eject_tray(struct ata_device *dev)

{

	struct ata_taskfile tf;

	const char cdb[] = {  GPCMD_START_STOP_UNIT,

	static const char cdb[ATAPI_CDB_LEN] = {  GPCMD_START_STOP_UNIT,

		0, 0, 0,

		0x02,     /* LoEj */

		0, 0, 0, 0, 0, 0, 0,
@@ -55,7 +55,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev) 
	unsigned int ret;

	struct rm_feature_desc *desc = (void *)(buf + 8);

	struct ata_taskfile tf;

	char cdb[] = {  GPCMD_GET_CONFIGURATION,

	static const char cdb[] = {  GPCMD_GET_CONFIGURATION,

			2,      /* only 1 feature descriptor requested */

			0, 3,   /* 3, removable medium feature */

			0, 0, 0,/* reserved */

drivers/atm/zatm.c

+2 −2
Original line number Diff line number Diff line
@@ -1151,8 +1151,8 @@ static void eprom_get_byte(struct zatm_dev *zatm_dev, unsigned char *byte, 
}





static unsigned char eprom_try_esi(struct atm_dev *dev, unsigned short cmd,

				   int offset, int swap)

static int eprom_try_esi(struct atm_dev *dev, unsigned short cmd, int offset,

			 int swap)

{

	unsigned char buf[ZEPROM_SIZE];

	struct zatm_dev *zatm_dev;