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

Commit 0927a7b7 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.91 (eef4cf65) into msm-4.14 



* refs/heads/tmp-eef4cf65:
  Revert "mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support"
  Linux 4.14.91
  drm/ioctl: Fix Spectre v1 vulnerabilities
  proc/sysctl: don't return ENOMEM on lookup when a table is unregistering
  mm: don't miss the last page because of round-off error
  ubifs: Handle re-linking of inodes correctly while recovery
  spi: imx: mx51-ecspi: Move some initialisation to prepare_message hook.
  spi: imx: add a device specific prepare_message callback
  iwlwifi: add new cards for 9560, 9462, 9461 and killer series
  iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares
  panic: avoid deadlocks in re-entrant console drivers
  x86/mtrr: Don't copy uninitialized gentry fields back to userspace
  Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
  KVM: Fix UAF in nested posted interrupt processing
  kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs
  posix-timers: Fix division by zero bug
  gpiolib-acpi: Only defer request_irq for GpioInt ACPI event handlers
  gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
  mmc: omap_hsmmc: fix DMA API warning
  mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl
  mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support
  mmc: core: Reset HPI enabled state during re-init and in case of errors
  scsi: sd: use mempool for discard special page
  USB: serial: option: add Telit LN940 series
  USB: serial: option: add Fibocom NL668 series
  USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode)
  USB: serial: option: add HP lt4132
  USB: serial: option: add GosunCn ZTE WeLink ME3630
  USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
  xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only
  USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
  cifs: integer overflow in in SMB2_ioctl()
  perf record: Synthesize features before events in pipe mode
  ib_srpt: Fix a use-after-free in __srpt_close_all_ch()
  ubifs: Fix directory size calculation for symlinks
  ASoC: sta32x: set ->component pointer in private struct
  block: fix infinite loop if the device loses discard capability
  block: break discard submissions into the user defined size

Conflicts:
	drivers/mmc/core/mmc.c

Change-Id: I1f0d24983198c7aa704dd334696e72dc8bf93b67
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 1ed79e16 66bf5ce5

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 90

SUBLEVEL = 91

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/include/asm/msr-index.h

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
#define MSR_F15H_NB_PERF_CTR		0xc0010241

#define MSR_F15H_PTSC			0xc0010280

#define MSR_F15H_IC_CFG			0xc0011021

#define MSR_F15H_EX_CFG			0xc001102c



/* Fam 10h MSRs */

#define MSR_FAM10H_MMIO_CONF_BASE	0xc0010058

arch/x86/kernel/cpu/mtrr/if.c

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) 
	struct mtrr_gentry gentry;

	void __user *arg = (void __user *) __arg;



	memset(&gentry, 0, sizeof(gentry));



	switch (cmd) {

	case MTRRIOC_ADD_ENTRY:

	case MTRRIOC_SET_ENTRY:

arch/x86/kvm/vmx.c

+2 −0
Original line number Diff line number Diff line
@@ -10447,6 +10447,8 @@ static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu, 
			kunmap(vmx->nested.pi_desc_page);

			kvm_release_page_dirty(vmx->nested.pi_desc_page);

			vmx->nested.pi_desc_page = NULL;

			vmx->nested.pi_desc = NULL;

			vmcs_write64(POSTED_INTR_DESC_ADDR, -1ull);

		}

		page = kvm_vcpu_gpa_to_page(vcpu, vmcs12->posted_intr_desc_addr);

		if (is_error_page(page))

arch/x86/kvm/x86.c

+2 −0
Original line number Diff line number Diff line
@@ -2227,6 +2227,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_AMD64_PATCH_LOADER:

	case MSR_AMD64_BU_CFG2:

	case MSR_AMD64_DC_CFG:

	case MSR_F15H_EX_CFG:

		break;



	case MSR_IA32_UCODE_REV:
@@ -2508,6 +2509,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_AMD64_BU_CFG2:

	case MSR_IA32_PERF_CTL:

	case MSR_AMD64_DC_CFG:

	case MSR_F15H_EX_CFG:

		msr_info->data = 0;

		break;

	case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL3: