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

Skip to content
Commit c3656359 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display



* quic/msm-4.14:
  power: smb5: Enable frequency switching
  ARM: dts: msm: Specify secondary charger configuration for SM8150 platforms
  power: smb5: Add support for selecting secondary chargers
  ARM: dts: msm: Fix smb1390 stat interrupt configuration on sm8150 platforms
  ARM: dts: msm: rename PMICs pm855* to be pm8150*
  coresight: Remote-etm: Set correct return value
  soc: qcom: Change compatible name of dcc_v2 to dcc-v2
  drivers: irqchip: mpm: Add support to set irq type
  irqchip: mpm: Add trace support to get mpm wakeup timer value
  drivers: irqchip: mpm: Clear pending interrupts in mpm exit sequence
  irqchip: mpm: Add MPM GPIO as top level interrupt controller
  drivers: pinctrl: msm: Support pinctrl as hierarchy irq domain
  drivers: qcom: mpm: Use irqchip declare macro to init mpm-gpio controller
  drivers: qcom: mpm: Use GIC fwspec translation for MPM-GIC
  drivers: qcom: mpm: Add the mpm-gpio interrupt controller support
  power: smb1351-charger: Add snapshot of SMB1351 charger driver
  configs: qcs405: enable PMIC drivers for QCS405
  coresight: stm: Fix null point issue in stm
  thermal: adc-tm: Update copyright year
  firmware_class: make firmware caching configurable
  soc: qcom: pil: Delay IRQ registration in subsys registration
  clk: qcom: gdsc-regulator: Remove polling logic when disabling GDSC HW CTL
  clk: qcom: gcc-sm8150: Remove the parent field for gcc_npu_axi_clk
  usb: gadget: f_gsi: Add MaxPacketSize in fs_descriptor
  arm: dma-mapping: map_page map to nearest page
  arm: dma-mapping: fix data types to hold size_t
  arm: dma-mapping: DMA buf may not have cpu virtual addr
  arm: make default iova alignment as 2mb
  msm: mdss: Add mdss capabilities for qcs405
  regulator: mem-acc: fix compilation for QCS405
  regulator: cpr: add snapshot of cpr-regulator driver
  SEEMP: minor fixes
  diag: Fix issues in STM configuration path
  ARM: dts: msm: Add device node support for TSENS in SM6150
  ARM: dts: msm: Rename ipa_loaduc on sm8150
  defconfig: Disable APSS ETM on perf configure
  mm, swap: introduce SWP_SYNCHRONOUS_IO
  thermal: tsens: Update order of members in TSENS device structure
  qseecom: fix dma_free_coherent issue
  msm: ipa4: IPA PM Unit tests init fix
  msm: vidc: Disable decode batching
  ARM: dts: msm: Add GPU CX debugbus register range for SM8150
  msm: kgsl: Rename CX_DBGC_CFG register block
  dma-buf: Display buffer name in debugfs
  msm: pcie: support PCIe loopback for SM8150
  leds: qpnp-flash: Add support to query maximum current
  staging: android: ion: Validate hyp assign number of elements
  ARM: dts: msm: enable napi for ipa on SM8150
  ARM: dts: msm: Add device tree files for sm6150 IDP platform
  mm: make cma the first choice for movable request
  ARM: dts: msm: Configure SMMU for fastRPC on sm6150
  trace: events: fix trace events used by secure cma allocations
  trace: irqsoff: fix irqs disabled tracking
  coresight-byte-cntr: Fix the Byte-Counter read operation
  coresight: Fix the mem_type and  mem_size of ETR
  drivers: irqchip: mpm: Add QTI SOC interrupt controller
  coresight:byte-cntr: fix the byte-counter of ETR
  iommu/arm-smmu: msm map/unmap calls for slave side secure targets
  iommu/arm-smmu: update tlb ops for slave side secure targets
  iommu/arm-smmu: Add NULL check for platform_get_resource return value
  iommu/arm-smmu: Initialize smmu on first attach
  iommu/arm-smmu: pass CB index for smmu programming by TZ
  iommu/arm-smmu: Add support for slave side protection
  ARM: dts: msm: Update SPI maximum frequency for QUP instances on QCS405
  seemp: Freeing el2 shared memory
  seemp: Port changes from 4.9 to 4.14
  ARM: dts: msm: Add VADC nodes for QCS405
  ARM: dts: msm: change PCIe1 WAKE to no-pull for sm8150-sdx50m
  soc: qcom: ssr: Initialize the shutdown_ack completion variable properly
  ARM: dts: msm: Add emergency mitigation config for SM8150
  cfg80211: Add backport flag for user cellular base hint
  ARM: dts: msm: Add ADSPRPC mem region DT entry for sm6150
  coresight: tmc: Fix mem size can't change issue
  defconfig: sm8150: enable QBT1000 driver
  soc: qcom: service-locator: Use interruptible wait for locator
  ARM: dts: msm: Add RPM stats support for qcs405
  ARM: dts: msm: Add RPMH master stats node for sm8150
  Linux 4.14.41
  KVM: x86: remove APIC Timer periodic/oneshot spikes
  KVM: PPC: Book3S HV: Fix handling of large pages in radix page fault handler
  perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map()
  perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]
  perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver
  perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr
  perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_*
  tracing/uprobe_event: Fix strncpy corner case
  sched/autogroup: Fix possible Spectre-v1 indexing for sched_prio_to_weight[]
  smb3: directory sync should not return an error
  nvme: add quirk to force medium priority for SQ creation
  thermal: exynos: Propagate error value from tmu_read()
  thermal: exynos: Reading temperature makes sense only when TMU is turned on
  Bluetooth: btusb: Only check needs_reset_resume DMI table for QCA rome chipsets
  Bluetooth: btusb: Add Dell XPS 13 9360 to btusb_needs_reset_resume_table
  Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"
  cpufreq: schedutil: Avoid using invalid next_freq
  PCI / PM: Check device_may_wakeup() in pci_enable_wake()
  PCI / PM: Always check PME wakeup capability for runtime wakeup support
  atm: zatm: Fix potential Spectre v1
  net: atm: Fix potential Spectre v1
  drm/atomic: Clean private obj old_state/new_state in drm_atomic_state_default_clear()
  drm/atomic: Clean old_state/new_state in drm_atomic_state_default_clear()
  drm/nouveau: Fix deadlock in nv50_mstm_register_connector()
  drm/i915: Fix drm:intel_enable_lvds ERROR message in kernel log
  drm/vc4: Fix scaling of uni-planar formats
  can: hi311x: Work around TX complete interrupt erratum
  can: hi311x: Acquire SPI lock on ->do_get_berr_counter
  can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg()
  ceph: fix rsize/wsize capping in ceph_direct_read_write()
  mm, oom: fix concurrent munlock and oom reaper unmap, v3
  mm: sections are not offlined during memory hotremove
  z3fold: fix reclaim lock-ups
  tracing: Fix regex_match_front() to not over compare the test string
  dm integrity: use kvfree for kvmalloc'd memory
  libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs
  rfkill: gpio: fix memory leak in probe error path
  gpio: fix error path in lineevent_create
  gpio: fix aspeed_gpio unmask irq
  gpioib: do not free unrequested descriptors
  compat: fix 4-byte infoleak via uninitialized struct field
  arm64: Add work around for Arm Cortex-A55 Erratum 1024718
  KVM: PPC: Book3S HV: Fix VRMA initialization with 2MB or 1GB memory backing
  KVM: PPC: Book3S HV: Fix guest time accounting with VIRT_CPU_ACCOUNTING_GEN
  KVM: PPC: Book3S HV: Fix trap number return from __kvmppc_vcore_entry
  bdi: Fix oops in wb_workfn()
  bdi: wake up concurrent wb_shutdown() callers.
  tcp: fix TCP_REPAIR_QUEUE bound checking
  perf: Remove superfluous allocation error check
  memcg: fix per_node_info cleanup
  inetpeer: fix uninit-value in inet_getpeer
  soreuseport: initialise timewait reuseport field
  ipv4: fix uninit-value in ip_route_output_key_hash_rcu()
  dccp: initialize ireq->ir_mark
  net: fix uninit-value in __hw_addr_add_ex()
  net: initialize skb->peeked when cloning
  net: fix rtnh_ok()
  netlink: fix uninit-value in netlink_sendmsg
  crypto: af_alg - fix possible uninit-value in alg_bind()
  kcm: Call strp_stop before strp_done in kcm_attach
  netfilter: ebtables: don't attempt to allocate 0-sized compat array
  ipvs: fix rtnl_lock lockups caused by start_sync_thread
  soc: qcom: Port rpm stats drivers from 4.4 to 4.9 kernel
  ARM: dts: msm: Add pm support for qcs405
  defconfig: Enable MSM_SPM support
  drivers: soc: qcom: Enable SPM driver
  msm: camera: cpas: Improve logging capability
  msm: kgsl: Enable Content Protection for A640 GPU
  ARM: dts: msm: Add the debug clock node for QCS405
  defconfig: Enable Debug CC for QCS405
  msm_11ad: update affinity to start from the first golden core
  uapi/media: Change stride alignment value for P010
  dwc3: gadget: Stop active transfer pending on ep0 out/in during reset
  usb: dwc3: Fix incorrect ep0 state on reset
  printk: Make the console flush configurable in hotplug path
  ARM: dts: msm: Add regulator devices for SM6150
  ARM: dts: msm: Update sm8150 to V6 memory map
  msm: camera: cpas: Use device tree entry to set camnoc-min-bw
  ARM: dts: msm: Add camnoc-min-bw entry in cpas node for sm8150
  mm: cma: sleep between retries in cma_alloc
  mm, oom: make dump_tasks public
  sched/trace: Add sched_task_util trace point
  Revert "core_ctl: Add a kernel parameter to disable core_ctl"
  ANDROID: goldfish: drop CONFIG_INPUT_KEYCHORD
  diag: Add support for modified mhi interface
  Linux 4.14.40
  tracing: Fix bad use of igrab in trace_uprobe.c
  irqchip/qcom: Fix check for spurious interrupts
  platform/x86: asus-wireless: Fix NULL pointer dereference
  usb: musb: trace: fix NULL pointer dereference in musb_g_tx()
  usb: musb: host: fix potential NULL pointer dereference
  USB: serial: option: adding support for ublox R410M
  USB: serial: option: reimplement interface masking
  USB: Accept bulk endpoints with 1024-byte maxpacket
  usb: dwc3: gadget: Fix list_del corruption in dwc3_ep_dequeue
  USB: serial: visor: handle potential invalid device configuration
  errseq: Always report a writeback error once
  test_firmware: fix setting old custom fw path back on exit, second try
  drm/bridge: vga-dac: Fix edid memory leak
  drm/vmwgfx: Fix a buffer object leak
  iw_cxgb4: Atomically flush per QP HW CQEs
  IB/hfi1: Fix NULL pointer dereference when invalid num_vls is used
  IB/hfi1: Fix loss of BECN with AHG
  IB/hfi1: Fix handling of FECN marked multicast packet
  IB/mlx5: Use unlimited rate when static rate is not supported
  NET: usb: qmi_wwan: add support for ublox R410M PID 0x90b2
  RDMA/mlx5: Protect from shift operand overflow
  RDMA/mlx5: Fix multiple NULL-ptr deref errors in rereg_mr flow
  RDMA/ucma: Allow resolving address w/o specifying source address
  RDMA/cxgb4: release hw resources on device removal
  xfs: prevent creating negative-sized file via INSERT_RANGE
  rtlwifi: cleanup 8723be ant_sel definition
  rtlwifi: btcoex: Add power_on_setting routine
  Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro
  Input: leds - fix out of bound access
  scsi: target: Fix fortify_panic kernel exception
  tracepoint: Do not warn on ENOMEM
  ALSA: aloop: Add missing cable lock to ctl API callbacks
  ALSA: aloop: Mark paused device as inactive
  ALSA: dice: fix kernel NULL pointer dereference due to invalid calculation for array index
  ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger()
  ALSA: pcm: Check PCM state at xfern compat ioctl
  ALSA: hda - Fix incorrect usage of IS_REACHABLE()
  USB: serial: option: Add support for Quectel EP06
  ACPI / button: make module loadable when booted in non-ACPI mode
  crypto: talitos - fix IPsec cipher in length
  percpu: include linux/sched.h for cond_resched()
  net: don't call update_pmtu unconditionally
  geneve: update skb dst pmtu on tx path
  ARM: dts: msm: add qcom,subsys-name for apr
  UPSTREAM: f2fs: avoid fsync() failure caused by EAGAIN in writepage()
  UPSTREAM: f2fs: clear PageError on writepage - part 2
  ANDROID: build.config: enforce trace_printk check
  FROMLIST: staging: Fix sparse warnings in vsoc driver.
  FROMLIST: staging: vsoc: Fix a i386-randconfig warning.
  FROMLIST: staging: vsoc: Create wc kernel mapping for region shm.
  arm64: dma-mapping: fix aliasing issues with non-CMA alloc
  ARM: dts: msm: Update SIDs for iommu test devices for sdmshrike
  iommu : arm-smmu : Fetch right SID in qsmmuv500_iova_to_phys_hard

Change-Id: Id85a94b8dccd1bc27b89bac3907052321ee57f41
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents ea68bc8e 90551fd1
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