Ivaylo Georgiev d8ebcdfb4e Merge android12-5.10.5+ (f50aeaf) into msm-5.10 ...

* refs/heads/tmp-f50aeaf:
  ANDROID: kbuild: handle excessively long argument lists
  ANDROID: kbuild: simplify cmd_mod
  FROMLIST: scsi: ufs: WB is only available on LUN #0 to #7
  FROMGIT: scsi: ufs: Fix tm request when non-fatal error happens
  FROMGIT: scsi: ufs: Fix livelock of ufshcd_clear_ua_wluns()
  ANDROID: arm64: Export show_regs for vendor module usage
  FROMGIT: usb: typec: ucsi: Add support for USB role switch
  ANDROID: mm: Export vmalloc_nr_pages
  ANDROID: Sched: Add export symbols for sched features
  ANDROID: sched/pause: prevent wake up paused cpus
  ANDROID: irq/proc: use active cpus for allowed irq affinity
  FROMGIT: scsi: ufs: Correct the lun used in eh_device_reset_handler() callback
  FROMLIST: arm64: reduce section size for sparsemem
  FROMGIT: dma-buf: cma_heap: Fix memory leak in CMA heap
  ANDROID: sched: Export symbol for vendor RT hook funcion
  ANDROID: sched: Export symbol for vendor RT hook funcion
  ANDROID: sched: cpufreq_schedutil: move sugov traces to sched
  ANDROID: scsi: ufs: fix build warning
  UPSTREAM: usb: typec: tcpm: Update vbus_vsafe0v on init
  UPSTREAM: PM: domains: create debugfs nodes when adding power domains
  ANDROID: iommu/io-pgtable-arm: Add support to use system cache with NWA policy
  ANDROID: mm/memory_hotplug: implement {add/remove}_memory_subsection
  ANDROID: Revert "iommu: Remove unused IOMMU_SYS_CACHE_ONLY flag"
  ANDROID: arm64/mm: implement {populate/depopulate}_range_driver_managed
  ANDROID: sched/fair: Sync task util for strf hook
  ANDROID: sched/fair: Sync task util early in feec
  ANDROID: GKI: Enable CONFIG_KUNIT
  FROMLIST: iommu: Introduce map_sg() as an IOMMU op for IOMMU drivers
  FROMLIST: iommu/io-pgtable: Introduce map_sg() as a page table op
  FROMGIT: scsi: ufs: Remove pre-defined initial voltage values of device power
  ANDROID: mm: Export pcpu_nr_pages
  ANDROID: GKI: Enable TRACE_MMIO_ACCESS config for gki_defconfig
  ANDROID: tracing: Add register read and write tracing support
  ANDROID: mm: Export total_swapcache_pages
  ANDROID: mm: Export si_swapinfo

Conflicts:
	drivers/usb/typec/ucsi/ucsi.c
	include/trace/events/power.h
	include/trace/events/sched.h
	kernel/sched/cpufreq_schedutil.c
	kernel/smp.c
	kernel/trace/Kconfig

Change-Id: I592f297373f2b008beb29a4ce6f970cd71de3574
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>

2021-01-14 09:29:39 -08:00

13 KiB

Raw Blame History

View Raw