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

Commit 7b47fbdf authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.9-o.80 (a9fd3188) into msm-4.9 



* refs/heads/tmp-a9fd3188:
  Linux 4.9.80
  spi: imx: do not access registers while clocks disabled
  serial: imx: Only wakeup via RTSDEN bit if the system has RTS/CTS
  usbip: vhci_hcd: clear just the USB_PORT_STAT_POWER bit
  usb/gadget: Fix "high bandwidth" check in usb_gadget_ep_match_desc()
  usb: uas: unconditionally bring back host after reset
  usb: f_fs: Prevent gadget unbind if it is already unbound
  USB: serial: simple: add Motorola Tetra driver
  usbip: list: don't list devices attached to vhci_hcd
  usbip: prevent bind loops on devices attached to vhci_hcd
  USB: serial: io_edgeport: fix possible sleep-in-atomic
  CDC-ACM: apply quirk for card reader
  USB: cdc-acm: Do not log urb submission errors on disconnect
  USB: serial: pl2303: new device id for Chilitag
  usb: option: Add support for FS040U modem
  tty: fix data race between tty_init_dev and flush of buf
  staging: lustre: separate a connection destroy from free struct kib_conn
  drm/vc4: Move IRQ enable to PM path
  staging: rtl8188eu: Fix incorrect response to SIOCGIWESSID
  usb: gadget: don't dereference g until after it has been null checked
  media: usbtv: add a new usbid
  ARM: dts: NSP: Fix PPI interrupt types
  iwlwifi: mvm: fix the TX queue hang timeout for MONITOR vif type
  scsi: ufs: ufshcd: fix potential NULL pointer dereference in ufshcd_config_vreg
  scsi: aacraid: Prevent crash in case of free interrupt during scsi EH path
  xfs: Properly retry failed dquot items in case of error during buffer writeback
  xfs: ubsan fixes
  drm/omap: Fix error handling path in 'omap_dmm_probe()'
  drm/bridge: tc358767: fix 1-lane behavior
  drm/bridge: tc358767: fix AUXDATAn registers access
  drm/bridge: tc358767: fix timing calculations
  drm/bridge: tc358767: fix DP0_MISC register set
  drm/bridge: tc358767: filter out too high modes
  drm/bridge: tc358767: do no fail on hi-res displays
  kmemleak: add scheduling point to kmemleak_scan()
  SUNRPC: Allow connect to return EHOSTUNREACH
  quota: Check for register_shrinker() failure.
  net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit
  drm/amdgpu: don't try to move pinned BOs
  xfs: fortify xfs_alloc_buftarg error handling
  bnxt_en: Fix an error handling path in 'bnxt_get_module_eeprom()'
  hwmon: (pmbus) Use 64bit math for DIRECT format values
  lockd: fix "list_add double add" caused by legacy signal interface
  nfsd: check for use of the closed special stateid
  grace: replace BUG_ON by WARN_ONCE in exit_net hook
  nfsd: Ensure we check stateid validity in the seqid operation checks
  nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0)
  auxdisplay: img-ascii-lcd: Only build on archs that have IOMEM
  xen-netfront: remove warning when unloading module
  xfs: always free inline data before resetting inode fork during ifree
  KVM: VMX: Fix rflags cache during vCPU reset
  KVM: X86: Fix softlockup when get the current kvmclock
  reiserfs: remove unneeded i_version bump
  btrfs: fix deadlock when writing out space cache
  mac80211: fix the update of path metric for RANN frame
  openvswitch: fix the incorrect flow action alloc size
  drm/amdkfd: Fix SDMA oversubsription handling
  drm/amdkfd: Fix SDMA ring buffer size calculation
  drm/amdgpu: Fix SDMA load/unload sequence on HWS disabled mode
  bcache: check return value of register_shrinker
  cpufreq: Add Loongson machine dependencies
  KVM: x86: ioapic: Preserve read-only values in the redirection table
  ACPI / bus: Leave modalias empty for devices which are not present
  KVM: x86: ioapic: Clear Remote IRR when entry is switched to edge-triggered
  KVM: x86: ioapic: Fix level-triggered EOI and IOAPIC reconfigure race
  KVM: X86: Fix operand/address-size during instruction decoding
  KVM: x86: Don't re-execute instruction when not passing CR2 value
  KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation failure
  cpupower : Fix cpupower working when cpu0 is offline
  cpupowerutils: bench - Fix cpu online check
  drm/vc4: Account for interrupts in flight
  igb: Free IRQs when device is hotplugged
  mtd: nand: denali_pci: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  gpio: ath79: add missing MODULE_DESCRIPTION/LICENSE
  gpio: iop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  power: reset: zx-reboot: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  HID: wacom: EKR: ensure devres groups at higher indexes are released
  crypto: af_alg - whitelist mask and type
  crypto: sha3-generic - fixes for alignment and big endian operation
  crypto: aesni - handle zero length dst buffer
  crypto: ecdh - fix typo in KPP dependency of CRYPTO_ECDH
  gpio: Fix kernel stack leak to userspace
  gpio: stmpe: i2c transfer are forbiden in atomic context
  tools/gpio: Fix build error with musl libc
  RDMA/mlx5: set UMR wqe fence according to HCA cap
  net/mlx5: Define interface bits for fencing UMR wqe
  loop: fix concurrent lo_open/lo_release

Conflicts:
	drivers/usb/gadget/function/f_fs.c

Change-Id: I7d7c14acbf35317a615a5da4f2303280345c2ec0
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents c1d68926 a9fd3188

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 79

SUBLEVEL = 80

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/bcm-nsp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
		timer@20200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x20200 0x100>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&periph_clk>;

		};
@@ -93,7 +93,7 @@ 
			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x20600 0x20>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_LEVEL_HIGH)>;

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&periph_clk>;

		};

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int helper_rfc4106_encrypt(struct aead_request *req) 


	if (sg_is_last(req->src) &&

	    req->src->offset + req->src->length <= PAGE_SIZE &&

	    sg_is_last(req->dst) &&

+	    sg_is_last(req->dst) && req->dst->length &&

	    req->dst->offset + req->dst->length <= PAGE_SIZE) {

		one_entry_in_sg = 1;

		scatterwalk_start(&src_sg_walk, req->src);

arch/x86/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, unsigned long cr2, 
static inline int emulate_instruction(struct kvm_vcpu *vcpu,

			int emulation_type)

{

	return x86_emulate_instruction(vcpu, 0, emulation_type, NULL, 0);

	return x86_emulate_instruction(vcpu, 0,

			emulation_type | EMULTYPE_NO_REEXECUTE, NULL, 0);

}



void kvm_enable_efer_bits(u64);

arch/x86/kvm/emulate.c

+7 −0
Original line number Diff line number Diff line
@@ -4990,6 +4990,8 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) 
	bool op_prefix = false;

	bool has_seg_override = false;

	struct opcode opcode;

	u16 dummy;

	struct desc_struct desc;



	ctxt->memop.type = OP_NONE;

	ctxt->memopp = NULL;
@@ -5008,6 +5010,11 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) 
	switch (mode) {

	case X86EMUL_MODE_REAL:

	case X86EMUL_MODE_VM86:

		def_op_bytes = def_ad_bytes = 2;

		ctxt->ops->get_segment(ctxt, &dummy, &desc, NULL, VCPU_SREG_CS);

		if (desc.d)

			def_op_bytes = def_ad_bytes = 4;

		break;

	case X86EMUL_MODE_PROT16:

		def_op_bytes = def_ad_bytes = 2;

		break;