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

Skip to content
Unverified Commit 33ac89fe authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0' of...

Merge tag 'LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.14 into android13-4.14-msmnile

"LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0"

* tag 'LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.14:
  pinctrl: qcom: Using readl_relaxed/writel_relaxed APIs
  net: qrtr: Add bounds check in rx path
  msm: adsprpc: Handle UAF in fastrpc internal munmap
  msm: kgsl: Keep postamble packets in a privileged buffer
  soc: qcom: qsee_ipc_irq_bridge: Remove redundant cleanup
  ANDROID: mm/filemap: Fix missing put_page() for speculative page fault
  ANDROID: Re-enable fast mremap and fix UAF with SPF
  ANDROID: mm: fix invalid backport in speculative page fault path
  ANDROID: mm: assert that mmap_lock is taken exclusively in vm_write_begin
  ANDROID: mm: remove sequence counting when mmap_lock is not exclusively owned
  ANDROID: mm/khugepaged: add missing vm_write_{begin|end}
  BACKPORT: FROMLIST: mm: implement speculative handling in filemap_fault()
  ANDROID: mm: prevent reads of unstable pmd during speculation
  ANDROID: mm: prevent speculative page fault handling for in do_swap_page()
  ANDROID: mm: skip pte_alloc during speculative page fault

 Conflicts:
	mm/khugepaged.c

Change-Id: I7de996406ca81ee31b4e605f6017d9800173ec12
parents cd36addb c2de11d8
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