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

Unverified Commit 602b687b authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge branch 'odm/rc/target/13/fp5' of...

Merge branch 'odm/rc/target/13/fp5' of https://gerrit-public.fairphone.software/kernel/msm-5.4 into lineage-21

* 'odm/rc/target/13/fp5' of https://gerrit-public.fairphone.software/kernel/msm-5.4:
  FP5-1576 Enter remdump when using tp touch
  [FP5-2774]Integrate security patch CVE-2023-33063
  [FP5-2774] Integrate security patch 2023-11 CVE-2023-33106
  [FP5-2774] Integrate security patch 2023-11 CVE-2023-33107
  [FP5-2659]:Waking up display with double tap not working when AOD is enabled.
  UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
  FP5-2734 [FP5]Open Uart log dynamically
  FP5-2528 WPSS Crash * Root Cause   WPSS Crash * Solution   porting qcom patch * Test Steps   do reboot stress test then check if reproduce or not
  FP5-2606 [FP5]Enable dump feature dynamically
  [2][FP5-2384][FP5 #339] 'Charging rapidly' is displayed even when choosing 'slow charging'

 Conflicts:
	arch/arm64/configs/vendor/fp5_QGKI.config
	drivers/power/reset/qcom-dload-mode.c
	net/core/skbuff.c

Change-Id: I509b7b1ce2422aebe11e5cfdfec9a5e827f90621
parents 6cdece3c dcd7038e
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