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

Commit 2e57b93c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into 'android11-5.4-lts'



Sync up with android11-5.4 for the following commits:

d8d40e5b ANDROID: fix kernelci build-break due to stop_ipi hook
de84825a BACKPORT: rcu/tree: Export rcu_idle_{enter,exit} to modules
c47964c5 ANDROID: GKI: Add some symbols to symbol list
ee9ce093 ANDROID: arm64: smp: fix Lockdep warning: RCU used illegally from idle CPU.
7a0b7843 ANDROID: Fix build-break caused by android_rvh_nf_conn_alloc hook
23277e65 ANDROID: GKI: Enable DEBUG_INFO_DWARF4
d0dc5d85 ANDROID: cfi: ensure RCU is watching in __cfi_slowpath
77bc008d UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
a7982ced BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr
6a2b4281 UPSTREAM: xfrm/compat: Add 32=>64-bit messages translator
da1cd0d7 UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator
1d5f89e5 UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator
1fa8e683 BACKPORT: xfrm: Provide API to register translator module
a10e83bb ANDROID: ABI: update allowed list for galaxy

Change-Id: I28c1e2d115799442d27286b6e1e988a271474ae1
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents edd60868 d8d40e5b
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