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

Skip to content
Commit 9cf1fbab authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.70 (e601ab6e) into msm-4.14



* refs/heads/tmp-e601ab6e:
  Linux 4.14.70
  arm64: Handle mismatched cache type
  arm64: Fix mismatched cache line size detection
  ASoC: wm8994: Fix missing break in switch
  arm64: cpu_errata: include required headers
  x86: kvm: avoid unused variable warning
  kvm: x86: Set highest physical address bits in non-present/reserved SPTEs
  Revert "ARM: imx_v6_v7_defconfig: Select ULPI support"
  irda: Only insert new objects into the global database via setsockopt
  irda: Fix memory leak caused by repeated binds of irda socket
  s390/lib: use expoline for all bcr instructions
  kbuild: make missing $DEPMOD a Warning instead of an Error
  drm/i915: Increase LSPCON timeout
  x86/xen: don't write ptes directly in 32-bit PV guests
  x86/pae: use 64 bit atomic xchg function in native_ptep_get_and_clear
  usb: dwc3: core: Fix ULPI PHYs and prevent phy_get/ulpi_init during suspend/resume
  HID: add quirk for another PIXART OEM mouse used by HP
  mm: Fix devm_memremap_pages() collision handling
  lightnvm: pblk: free padded entries in write buffer
  sched/deadline: Fix switching to -deadline
  debugobjects: Make stack check warning more informative
  uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name
  drm/amdgpu:add VCN booting with firmware loaded by PSP
  drm/amdgpu:add VCN support in PSP driver
  drm/amdgpu:add new firmware id for VCN
  drm/amdgpu:add tmr mc address into amdgpu_firmware_info
  drm/amdgpu: update tmr mc address
  drm/edid: Add 6 bpc quirk for SDC panel in Lenovo B50-80
  drm/amd/pp/Polaris12: Fix a chunk of registers missed to program
  drm/amdgpu: Fix RLC safe mode test in gfx_v9_0_enter_rlc_safe_mode
  drm/i915/lpe: Mark LPE audio runtime pm as "no callbacks"
  ARM: rockchip: Force CONFIG_PM on Rockchip systems
  arm64: rockchip: Force CONFIG_PM on Rockchip systems
  btrfs: Don't remove block group that still has pinned down bytes
  btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized
  btrfs: replace: Reset on-disk dev stats value after replace
  btrfs: Exit gracefully when chunk map cannot be inserted to the tree
  kvm: nVMX: Fix fault vector for VMX operation at CPL > 0
  KVM: vmx: track host_state.loaded using a loaded_vmcs pointer
  clk: rockchip: Add pclk_rkpwm_pmu to PMU critical clocks in rk3399
  powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX.
  powerpc/64s: Make rfi_flush_fallback a little more robust
  powerpc/platforms/85xx: fix t1042rdb_diu.c build errors & warning
  SMB3: Number of requests sent should be displayed for SMB3 not just CIFS
  smb3: fix reset of bytes read and written stats
  cfq: Suppress compiler warnings about comparisons
  RDS: IB: fix 'passing zero to ERR_PTR()' warning
  selftests/powerpc: Kill child processes on SIGINT
  iommu/omap: Fix cache flushes on L2 table entries
  ASoC: rt5677: Fix initialization of rt5677_of_match.data
  staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice
  dm kcopyd: avoid softlockup in run_complete_job
  PCI: mvebu: Fix I/O space end address calculation
  xen/balloon: fix balloon initialization for PVH Dom0
  Input: do not use WARN() in input_alloc_absinfo()
  NFSv4: Fix error handling in nfs4_sp4_select_mode()
  scsi: aic94xx: fix an error code in aic94xx_init()
  ACPI / scan: Initialize status to ACPI_STA_DEFAULT
  s390/dasd: fix panic for failed online processing
  s390/dasd: fix hanging offline processing due to canceled worker
  block: bvec_nr_vecs() returns value for wrong slab
  perf probe powerpc: Fix trace event post-processing
  powerpc: Fix size calculation using resource_size()
  powerpc/uaccess: Enable get_user(u64, *p) on 32-bit
  f2fs: fix to clear PG_checked flag in set_page_dirty()
  net/9p: fix error path of p9_virtio_probe
  net/9p/trans_fd.c: fix race by holding the lock
  irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP
  perf tools: Check for null when copying nsinfo.
  net: hns3: Fix for phy link issue when using marvell phy driver
  net: hns3: Fix for command format parsing error in hclge_is_all_function_id_zero
  RDMA/hns: Fix usage of bitmap allocation functions return values
  tcp, ulp: add alias for all ulp modules
  netfilter: fix memory leaks on netlink_dump_start error
  platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360
  mfd: sm501: Set coherent_dma_mask when creating subdevices
  ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest()
  s390/kdump: Fix memleak in nt_vmcoreinfo
  netfilter: ip6t_rpfilter: set F_IFACE for linklocal addresses
  platform/x86: intel_punit_ipc: fix build errors
  fs/dcache.c: fix kmemcheck splat at take_dentry_name_snapshot()
  mm/fadvise.c: fix signed overflow UBSAN complaint
  pwm: meson: Fix mux clock names
  IB/hfi1: Invalid NUMA node information can cause a divide by zero
  x86/mce: Add notifier_block forward declaration
  virtio: pci-legacy: Validate queue pfn
  scripts: modpost: check memory allocation results
  fat: validate ->i_start before using
  fs/proc/kcore.c: use __pa_symbol() for KCORE_TEXT list entries
  hfsplus: fix NULL dereference in hfsplus_lookup()
  reiserfs: change j_timestamp type to time64_t
  fork: don't copy inconsistent signal handler state to child
  sunrpc: Don't use stack buffer with scatterlist
  hfs: prevent crash on exit from failed search
  hfsplus: don't return 0 when fill_super() failed
  cifs: check if SMB2 PDU size has been padded and suppress the warning
  net: sched: action_ife: take reference to meta module
  act_ife: fix a potential deadlock
  act_ife: move tcfa_lock down to where necessary
  hv_netvsc: Fix a deadlock by getting rtnl lock earlier in netvsc_probe()
  hv_netvsc: ignore devices that are not PCI
  vhost: correctly check the iova range when waking virtqueue
  mlxsw: spectrum_switchdev: Do not leak RIFs when removing bridge
  sctp: hold transport before accessing its asoc in sctp_transport_get_next
  nfp: wait for posted reconfigs when disabling the device
  tipc: fix a missing rhashtable_walk_exit()
  net/sched: act_pedit: fix dump of extended layered op
  vti6: remove !skb->ignore_df check from vti6_xmit()
  tcp: do not restart timewait timer on rst reception
  r8169: add support for NCube 8168 network card
  qlge: Fix netdev features configuration.
  net: sched: Fix memory exposure from short TCA_U32_SEL
  net: macb: do not disable MDIO bus at open/close time
  net: bcmgenet: use MAC link status for fixed phy
  ipv4: tcp: send zero IPID for RST and ACK sent in SYN-RECV and TIME-WAIT state
  act_ife: fix a potential use-after-free

Conflicts:
	arch/arm64/include/asm/cpucaps.h
	arch/arm64/kernel/cpu_errata.c
	drivers/usb/dwc3/core.c

Change-Id: If27731291adb25e780b5eb7f202762f6ea065cd8
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 3c38b3e5 e601ab6e
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