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

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

Merge 4.19.173 into android-4.19-stable 



Changes in 4.19.173
	nbd: freeze the queue while we're adding connections
	ACPI: sysfs: Prefer "compatible" modalias
	kernel: kexec: remove the lock operation of system_transition_mutex
	xen/privcmd: allow fetching resource sizes
	ALSA: hda/via: Apply the workaround generically for Clevo machines
	media: rc: ensure that uevent can be read directly after rc device register
	ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
	wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
	net: usb: qmi_wwan: added support for Thales Cinterion PLSx3 modem family
	PM: hibernate: flush swap writer after marking
	drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
	drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
	KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[]
	KVM: x86: get smi pending status correctly
	xen: Fix XenStore initialisation for XS_LOCAL
	leds: trigger: fix potential deadlock with libata
	mt7601u: fix kernel crash unplugging the device
	mt7601u: fix rx buffer refcounting
	xen-blkfront: allow discard-* nodes to be optional
	ARM: imx: build suspend-imx6.S with arm instruction set
	netfilter: nft_dynset: add timeout extension to template
	xfrm: Fix oops in xfrm_replay_advance_bmp
	xfrm: fix disable_xfrm sysctl when used on xfrm interfaces
	RDMA/cxgb4: Fix the reported max_recv_sge value
	pNFS/NFSv4: Fix a layout segment leak in pnfs_layout_process()
	iwlwifi: pcie: use jiffies for memory read spin time limit
	iwlwifi: pcie: reschedule in long-running memory reads
	mac80211: pause TX while changing interface type
	net/mlx5: Fix memory leak on flow table creation error flow
	can: dev: prevent potential information leak in can_fill_info()
	iommu/vt-d: Gracefully handle DMAR units with no supported address widths
	iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
	rxrpc: Fix memory leak in rxrpc_lookup_local
	NFC: fix resource leak when target index is invalid
	NFC: fix possible resource leak
	team: protect features update by RCU to avoid deadlock
	tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN
	Linux 4.19.173

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: If4b2010c599fb95520fd0c28f9f389f35ac196cd
parents 6b80031f a0b26b9f

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 172

SUBLEVEL = 173

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ 


			/* VDD_AUD_1P8: Audio codec */

			reg_aud_1p8v: ldo3 {

				regulator-name = "vdd1p8";

				regulator-name = "vdd1p8a";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;

arch/arm/mach-imx/suspend-imx6.S

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define MX6Q_CCM_CCR	0x0



	.align 3

	.arm



	.macro  sync_l2_cache

arch/x86/kvm/pmu_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct kvm_event_hw_type_mapping intel_arch_events[] = { 
	[4] = { 0x2e, 0x41, PERF_COUNT_HW_CACHE_MISSES },

	[5] = { 0xc4, 0x00, PERF_COUNT_HW_BRANCH_INSTRUCTIONS },

	[6] = { 0xc5, 0x00, PERF_COUNT_HW_BRANCH_MISSES },

	[7] = { 0x00, 0x30, PERF_COUNT_HW_REF_CPU_CYCLES },

	[7] = { 0x00, 0x03, PERF_COUNT_HW_REF_CPU_CYCLES },

};



/* mapping between fixed pmc index and intel_arch_events array */

arch/x86/kvm/x86.c

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static u64 __read_mostly cr4_reserved_bits = CR4_RESERVED_BITS; 


static void update_cr8_intercept(struct kvm_vcpu *vcpu);

static void process_nmi(struct kvm_vcpu *vcpu);

static void process_smi(struct kvm_vcpu *vcpu);

static void enter_smm(struct kvm_vcpu *vcpu);

static void __kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);

static void store_regs(struct kvm_vcpu *vcpu);
@@ -3499,6 +3500,10 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, 
					       struct kvm_vcpu_events *events)

{

	process_nmi(vcpu);



	if (kvm_check_request(KVM_REQ_SMI, vcpu))

		process_smi(vcpu);



	/*

	 * FIXME: pass injected and pending separately.  This is only

	 * needed for nested virtualization, whose state cannot be