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

Skip to content
Commit 21c243f1 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-q.134 (81c83103) into msm-4.14



* refs/heads/tmp-81c83103:
  Linux 4.14.134
  drm/udl: move to embedding drm device inside udl device.
  drm/udl: introduce a macro to convert dev to udl.
  crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
  s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
  s390/qdio: (re-)initialize tiqdio list entries
  s390: fix stfle zero padding
  ARC: hide unused function unw_hdr_alloc
  linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL
  cpu/hotplug: Fix out-of-bounds read when setting fail state
  x86/boot/64: Fix crash if kernel image crosses page table boundary
  dm verity: use message limit for data block corruption message
  ARM: dts: imx6ul: fix PWM[1-4] interrupts
  sis900: fix TX completion
  ppp: mppe: Add softdep to arc4
  be2net: fix link failure after ethtool offline test
  ARM: omap2: remove incorrect __init annotation
  perf/core: Fix perf_sample_regs_user() mm check
  efi/bgrt: Drop BGRT status field reserved bits check
  clk: ti: clkctrl: Fix returning uninitialized data
  MIPS: Remove superfluous check for __linux__
  VMCI: Fix integer overflow in VMCI handle arrays
  carl9170: fix misuse of device driver API
  binder: fix memory leak in error path
  staging: comedi: amplc_pci230: fix null pointer deref on interrupt
  staging: comedi: dt282x: fix a null pointer deref on interrupt
  usb: renesas_usbhs: add a workaround for a race condition of workqueue
  usb: gadget: ether: Fix race between gether_disconnect and rx_submit
  p54usb: Fix race between disconnect and firmware loading
  Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled"
  USB: serial: option: add support for GosunCn ME3630 RNDIS mode
  USB: serial: ftdi_sio: add ID for isodebug v1
  mwifiex: Don't abort on small, spec-compliant vendor IEs
  mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
  mwifiex: Abort at too short BSS descriptor element
  Documentation: Add section about CPU vulnerabilities for Spectre
  x86/tls: Fix possible spectre-v1 in do_get_thread_area()
  x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
  block, bfq: NULL out the bic when it's no longer valid
  ALSA: hda/realtek - Headphone Mic can't record after S3
  udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
  fscrypt: don't set policy for a dead directory
  net :sunrpc :clnt :Fix xps refcount imbalance on the error path
  net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
  quota: fix a problem about transfer quota
  net: lio_core: fix potential sign-extension overflow on large shift
  ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
  drm: return -EFAULT if copy_to_user() fails
  bnx2x: Check if transceiver implements DDM before access
  md: fix for divide error in status_resync
  qmi_wwan: extend permitted QMAP mux_id value range
  qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode
  qmi_wwan: add support for QMAP padding in the RX path
  mac80211: only warn once on chanctx_conf being NULL
  ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
  ARM: davinci: da850-evm: call regulator_has_full_constraints()
  mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
  KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
  Input: imx_keypad - make sure keyboard can always wake up system
  ARM: dts: am335x phytec boards: Fix cd-gpios active level
  ibmvnic: Refresh device multicast list after reset
  can: af_can: Fix error path of can_init()
  can: m_can: implement errata "Needless activation of MRAF irq"
  can: mcp251x: add support for mcp25625
  dt-bindings: can: mcp251x: add mcp25625 support
  netfilter: ipv6: nf_defrag: accept duplicate fragments again
  netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
  iwlwifi: Fix double-free problems in iwl_req_fw_callback()
  mwifiex: Fix possible buffer overflows at parsing bss descriptor
  mac80211: free peer keys before vif down in mesh
  mac80211: mesh: fix RCU warning
  staging:iio:ad7150: fix threshold mode config bit
  bpf: sockmap, fix use after free from sleep in psock backlog workqueue
  samples, bpf: fix to change the buffer size for read()
  Input: elantech - enable middle button support on 2 ThinkPads
  crypto: talitos - rename alternative AEAD algos.
  drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
  nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
  Input: synaptics - enable SMBUS on T480 thinkpad trackpad
  e1000e: start network tx queue only when link is up
  Revert "e1000e: fix cyclic resets at link up with active tx"

Conflicts:
	include/linux/cpuhotplug.h

Change-Id: Ic199a589acbbb88481aaf57af660ff6ddee75921
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 297cae3b 81c83103
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