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

Commit d46b5c94 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge android-4.14.52 (08850d51) into msm-4.14 



* remotes/origin/tmp-08850d51:
  Linux 4.14.52
  mm, page_alloc: do not break __GFP_THISNODE by zonelist reset
  fs/binfmt_misc.c: do not allow offset overflow
  vhost: fix info leak due to uninitialized memory
  HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large
  HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation
  orangefs: report attributes_mask and attributes for statx
  orangefs: set i_size on new symlink
  iwlwifi: fw: harden page loading code
  x86/intel_rdt: Enable CMT and MBM on new Skylake stepping
  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()
  cpufreq: governors: Fix long idle detection logic in load calculation
  cpufreq: Fix new policy initialization during limits updates via sysfs
  bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue
  blk-mq: reinit q->tag_set_list entry only after grace period
  nbd: use bd_set_size when updating disk size
  nbd: update size when connected
  nbd: fix nbd device deletion
  cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class
  CIFS: 511c54a2 adds a check for session expiry
  smb3: on reconnect set PreviousSessionId field
  smb3: fix various xid leaks
  x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read()
  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()
  ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation
  ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs
  btrfs: scrub: Don't use inode pages for device replace
  btrfs: return error value if create_io_em failed in cow_file_range
  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: correctly handle a zero-length xattr with a non-zero e_value_offs
  ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget()
  ext4: do not allow external inodes for inline data
  ext4: update mtime in ext4_punch_hole even if no blocks are released
  ext4: fix hole length detection in ext4_ind_map_blocks()
  NFSv4.1: Fix up replays of interrupted requests
  tls: fix use-after-free in tls_push_record
  hv_netvsc: Fix a network regression after ifdown/ifup
  net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan
  udp: fix rx queue len reported by diag and proc interface
  socket: close race condition between sock_close() and sockfs_setattr()
  tcp: verify the checksum of the first data segment in a new connection
  net/sched: act_simple: fix parsing of TCA_DEF_DATA
  net: dsa: add error handling for pskb_trim_rcsum
  ipv6: allow PMTU exceptions to local routes
  cdc_ncm: avoid padding beyond end of skb
  bonding: re-evaluate force_primary when the primary slave name changes
  ANDROID: sdcardfs: fix potential crash when reserved_mb is not zero
  ANDROID: xt_qtaguid: Remove unnecessary null checks to device's name
  ANDROID: Add kconfig to make dm-verity check_at_most_once default enabled

Conflicts:
	net/netfilter/xt_qtaguid.c

Change-Id: I5c94ff8a691b9d84899d7863fbd309aa41c5c338
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents bbea3fef 08850d51

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 51

SUBLEVEL = 52

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/kernel/cpu/intel_rdt.c

+2 −0
Original line number Diff line number Diff line
@@ -773,6 +773,8 @@ static __init void rdt_quirks(void) 
	case INTEL_FAM6_SKYLAKE_X:

		if (boot_cpu_data.x86_stepping <= 4)

			set_rdt_options("!cmt,!mbmtotal,!mbmlocal,!l3cat");

		else

			set_rdt_options("!l3cat");

	}

}

arch/x86/kernel/cpu/mcheck/mce-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct dentry *dfs_inj; 


static u8 n_banks;



#define MAX_FLAG_OPT_SIZE	3

#define MAX_FLAG_OPT_SIZE	4

#define NBCFG			0x44



enum injection_type {

block/blk-mq.c

+1 −2
Original line number Diff line number Diff line
@@ -2252,7 +2252,6 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q) 


	mutex_lock(&set->tag_list_lock);

	list_del_rcu(&q->tag_set_list);

	INIT_LIST_HEAD(&q->tag_set_list);

	if (list_is_singular(&set->tag_list)) {

		/* just transitioned to unshared */

		set->flags &= ~BLK_MQ_F_TAG_SHARED;
@@ -2260,8 +2259,8 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q) 
		blk_mq_update_tag_set_depth(set, false);

	}

	mutex_unlock(&set->tag_list_lock);



	synchronize_rcu();

	INIT_LIST_HEAD(&q->tag_set_list);

}



static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set,

drivers/ata/libata-core.c

+0 −3
Original line number Diff line number Diff line
@@ -4543,9 +4543,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, },