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

Skip to content
Commit 06f012f2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Sync up with android11-5.4 for the following commits:

3970bc62 UPSTREAM: Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
6b9c39b9 Merge tag 'android11-5.4.197_r00' into 'android11-5.4'
9b75ceec FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
a25d82d6 ANDROID: abi_gki_aarch64_qcom: Add vmemdup_user to qcom symbol list
0cb7b914 ANDROID: GKI: update Sony KMI symbol list
8828cbe3 UPSTREAM: mm: fix misplaced unlock_page in do_wp_page()
e791f407 BACKPORT: mm: do_wp_page() simplification
fb8e4568 UPSTREAM: mm/ksm: Remove reuse_ksm_page()

Update the .xml file with the new symbols being tracked:

Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

1 Added function:

  [A] 'function void input_set_timestamp(input_dev*, ktime_t)'

Change-Id: I01a49bc65a901bc21cffb676c45e985eec92fda5
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d3891851 3970bc62
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