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

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

Merge 4.14.52 into android-4.14 



Changes in 4.14.52
	bonding: re-evaluate force_primary when the primary slave name changes
	cdc_ncm: avoid padding beyond end of skb
	ipv6: allow PMTU exceptions to local routes
	net: dsa: add error handling for pskb_trim_rcsum
	net/sched: act_simple: fix parsing of TCA_DEF_DATA
	tcp: verify the checksum of the first data segment in a new connection
	socket: close race condition between sock_close() and sockfs_setattr()
	udp: fix rx queue len reported by diag and proc interface
	net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan
	hv_netvsc: Fix a network regression after ifdown/ifup
	tls: fix use-after-free in tls_push_record
	NFSv4.1: Fix up replays of interrupted requests
	ext4: fix hole length detection in ext4_ind_map_blocks()
	ext4: update mtime in ext4_punch_hole even if no blocks are released
	ext4: do not allow external inodes for inline data
	ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget()
	ext4: correctly handle a zero-length xattr with a non-zero e_value_offs
	ext4: fix fencepost error in check for inode count overflow during resize
	driver core: Don't ignore class_dir_create_and_add() failure.
	Btrfs: fix clone vs chattr NODATASUM race
	Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2()
	btrfs: return error value if create_io_em failed in cow_file_range
	btrfs: scrub: Don't use inode pages for device replace
	ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs
	ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation
	ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream()
	ALSA: hda: add dock and led support for HP EliteBook 830 G5
	ALSA: hda: add dock and led support for HP ProBook 640 G4
	x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read()
	smb3: fix various xid leaks
	smb3: on reconnect set PreviousSessionId field
	CIFS: 511c54a2 adds a check for session expiry
	cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class
	nbd: fix nbd device deletion
	nbd: update size when connected
	nbd: use bd_set_size when updating disk size
	blk-mq: reinit q->tag_set_list entry only after grace period
	bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue
	cpufreq: Fix new policy initialization during limits updates via sysfs
	cpufreq: governors: Fix long idle detection logic in load calculation
	libata: zpodd: small read overflow in eject_tray()
	libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk
	w1: mxc_w1: Enable clock before calling clk_get_rate() on it
	x86/intel_rdt: Enable CMT and MBM on new Skylake stepping
	iwlwifi: fw: harden page loading code
	orangefs: set i_size on new symlink
	orangefs: report attributes_mask and attributes for statx
	HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation
	HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large
	vhost: fix info leak due to uninitialized memory
	fs/binfmt_misc.c: do not allow offset overflow
	mm, page_alloc: do not break __GFP_THISNODE by zonelist reset
	Linux 4.14.52

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c4b98f64 a26899e0

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, },