Merge tag 'LA.UM.9.14.r1-22400-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina

"LA.UM.9.14.r1-22400-LAHAINA.QSSI13.0"

* tag 'LA.UM.9.14.r1-22400-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  virt: haven: Correct max_buf_size for a connection
  mtd: msm_qpic_nand: Add runtime status check in notifiers
  defconfig: sdxlemur: Enable binder configs
  BACKPORT: FROMLIST: mm: protect free_pgtables with mmap_lock write lock in exit_mmap
  PCI: Configure RC MPS to 128 for Realtek 8168 attach
  bus: mhi: misc: Add check for dev_rp if it is iommu range or not
  drivers: qcom: pil: Use update_marker for modem book kpi
  soc: qcom: add buffer overflow check on AON rx_buffer
  msm: kgsl: Defer drawobj_sync_timeline_fence_work() to a workqueue
  memshare: Avoid accessing uninitialized nodes
  ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
  soc: qcom: socinfo: Add soc information for Blair APQ
  soc: qcom: minidump: check the size parameter passed to qcom_smem_get()
  drivers: qcom: pil: Add KPI boot markers for modem
  usb: gadget: cdev: Fix spinlock recursion
  defconfig: sdxlemur: Realtek r8168 IOSS glue driver config

 Conflicts:
	arch/arm64/boot/dts/vendor/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
	drivers/clk/qcom/gcc-qcs404.c

Change-Id: Ied2b86eda79d66e747ce5f4b7a3c83c3328edd2b
This commit is contained in:
Michael Bestas 2023-09-19 17:21:49 +03:00
commit 282bf6f21e
No known key found for this signature in database
GPG key ID: CC95044519BE6669
21 changed files with 5973 additions and 4221 deletions

View file

@ -6,6 +6,7 @@
#ifdef CONFIG_QGKI_MSM_BOOT_TIME_MARKER
void place_marker(const char *name);
void update_marker(const char *name);
void destroy_marker(const char *name);
unsigned long long msm_timer_get_sclk_ticks(void);
static inline int boot_marker_enabled(void) { return 1; }
@ -13,6 +14,7 @@ static inline int boot_marker_enabled(void) { return 1; }
static inline int init_bootkpi(void) { return 0; }
static inline void exit_bootkpi(void) { };
static inline void place_marker(char *name) { };
static inline void update_marker(char *name) { };
static inline void destroy_marker(const char *name) { };
static inline int boot_marker_enabled(void) { return 0; }
static inline unsigned long long msm_timer_get_sclk_ticks(void) { return -EINVAL; }