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

Commit a237e18f authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

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



* refs/heads/tmp-00a0bcbf:
  Linux 4.9.110
  fs/binfmt_misc.c: do not allow offset overflow
  vhost: fix info leak due to uninitialized memory
  HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation
  orangefs: set i_size on new symlink
  w1: mxc_w1: Enable clock before calling clk_get_rate() on it
  libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk
  libata: zpodd: small read overflow in eject_tray()
  libata: zpodd: make arrays cdb static, reduces object code size
  cpufreq: Fix new policy initialization during limits updates via sysfs
  smb3: on reconnect set PreviousSessionId field
  ALSA: hda: add dock and led support for HP ProBook 640 G4
  ALSA: hda: add dock and led support for HP EliteBook 830 G5
  ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream()
  btrfs: scrub: Don't use inode pages for device replace
  Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2()
  Btrfs: fix clone vs chattr NODATASUM race
  driver core: Don't ignore class_dir_create_and_add() failure.
  ext4: fix fencepost error in check for inode count overflow during resize
  ext4: update mtime in ext4_punch_hole even if no blocks are released
  ext4: fix hole length detection in ext4_ind_map_blocks()
  ALSA: hda/realtek - New codec support for ALC257
  tcp: verify the checksum of the first data segment in a new connection
  net/sched: act_simple: fix parsing of TCA_DEF_DATA
  ipv6: allow PMTU exceptions to local routes
  bonding: re-evaluate force_primary when the primary slave name changes
  usb: musb: fix remote wakeup racing with suspend
  Btrfs: make raid6 rebuild retry more
  tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
  Revert "Btrfs: fix scrub to repair raid6 corruption"
  net: dsa: b53: Add BCM5389 support
  net/sonic: Use dma_mapping_error()
  platform/x86: asus-wmi: Fix NULL pointer dereference
  net: qmi_wwan: Add Netgear Aircard 779S
  atm: zatm: fix memcmp casting
  iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs
  ipvs: fix buffer overflow with sync daemon and service
  netfilter: ebtables: handle string from userspace with care
  xfrm6: avoid potential infinite loop in _decode_session6()
  objtool: update .gitignore file
  ANDROID: Add kconfig to make dm-verity check_at_most_once default enabled
  ANDROID: xt_qtaguid: Remove unnecessary null checks to device's name
  UPSTREAM: cpufreq: schedutil: use now as reference when aggregating shared policy requests
  ANDROID: sdcardfs: fix potential crash when reserved_mb is not zero

Conflicts:
	kernel/sched/cpufreq_schedutil.c

Change-Id: I3414809dce435c8d070590f7205719c9b7e17e17
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 32a48c44 00a0bcbf

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;