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

Skip to content
Commit 7eb63d82 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge android-4.14.50 (154a9b5a) into msm-4.14



* remotes/origin/tmp-154a9b5a:
  Linux 4.14.50
  crypto: omap-sham - fix memleak
  crypto: vmx - Remove overly verbose printk from AES XTS init
  crypto: vmx - Remove overly verbose printk from AES init routines
  crypto: cavium - Limit result reading attempts
  crypto: cavium - Fix fallout from CONFIG_VMAP_STACK
  crypto: caam - fix size of RSA prime factor q
  crypto: caam/qi - fix IV DMA mapping and updating
  crypto: caam - fix IV DMA mapping and updating
  crypto: caam - fix DMA mapping dir for generated IV
  crypto: caam - strip input zeros from RSA input buffer
  Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
  Input: goodix - add new ACPI id for GPD Win 2 touch screen
  kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access
  tty: pl011: Avoid spuriously stuck-off interrupts
  vmw_balloon: fixing double free when batching mode is off
  serial: 8250: omap: Fix idling of clocks for unused uarts
  serial: samsung: fix maxburst parameter for DMA transactions
  tty/serial: atmel: use port->name as name in request_irq()
  serial: sh-sci: Stop using printk format %pCr
  usb: gadget: udc: renesas_usb3: disable the controller's irqs for reconnecting
  usb: gadget: function: printer: avoid wrong list handling in printer_write()
  phy: qcom-qusb2: Fix crash if nvmem cell not specified
  Input: xpad - add GPD Win 2 Controller USB IDs
  usb-storage: Add compatibility quirk flags for G-Technologies G-Drive
  usb-storage: Add support for FL_ALWAYS_SYNC flag in the UAS driver
  usbip: vhci_sysfs: fix potential Spectre v1
  NFC: pn533: don't send USB data off of the stack
  staging: android: ion: Switch to pr_warn_once in ion_buffer_destroy
  KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system
  kvm: nVMX: Enforce cpl=0 for VMX instructions
  KVM: x86: introduce linear_{read,write}_system
  KVM: X86: Fix reserved bits check for MOV to CR3
  gpio: No NULL owner
  af_key: Always verify length of provided sadb_key
  blkdev_report_zones_ioctl(): Use vmalloc() to allocate large buffers
  netfilter: nf_tables: fix NULL pointer dereference on nft_ct_helper_obj_dump()

Conflicts:
	drivers/staging/android/ion/ion.c

Change-Id: I4f531129c9339cf5c1083a046812f2607a183059
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents de23544f 154a9b5a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment