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

Skip to content
Commit 98c101df authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (dc2d5a0a) into msm-5.4



* refs/heads/tmp-dc2d5a0a:
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: modules: cfi cleanup for module load failure
  ANDROID: Temporarily disable XFRM_USER_COMPAT filtering
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: update allowed list for QCOM
  ANDROID: fix kernelci build-break due to stop_ipi hook
  BACKPORT: rcu/tree: Export rcu_idle_{enter,exit} to modules
  ANDROID: GKI: Add some symbols to symbol list
  ANDROID: arm64: smp: fix Lockdep warning: RCU used illegally from idle CPU.
  ANDROID: Fix build-break caused by android_rvh_nf_conn_alloc hook
  ANDROID: GKI: Enable DEBUG_INFO_DWARF4
  ANDROID: cfi: ensure RCU is watching in __cfi_slowpath
  UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
  BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr
  UPSTREAM: xfrm/compat: Add 32=>64-bit messages translator
  UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator
  UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator
  BACKPORT: xfrm: Provide API to register translator module
  ANDROID: ABI: update allowed list for galaxy
  ANDROID: Update the KMI_GENERATION after KMI changes on October 31
  ANDROID: Input: bump SW_MAX up to 0x3f
  ANDROID: GKI: ABI update for Oct 31 KABI break
  ANDROID: GKI: add Android ABI padding to struct nf_conn
  ANDROID: GKI: add vendor padding variable in struct skb_shared_info
  ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle
  ANDROID: GKI: add vendor padding variable in struct nf_conn
  ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle
  ANDROID: GKI: add vendor padding variable in struct sock
  ANDROID: fuse: Add support for d_canonical_path
  ANDROID: vfs: add d_canonical_path for stacked filesystem support
  ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
  Revert "ANDROID: GKI: fix ABI breakage in module.h"
  ANDROID: ABI: update allowed list for galaxy
  FROMLIST: char: misc: increase DYNAMIC_MINORS value

 Conflicts:
	net/netfilter/nf_conntrack_core.c

Change-Id: I0687237ba5f07f291a5f3b49ee2057071fcb2717
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents b482a807 dc2d5a0a
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