[automerger skipped] Merge Android 12 am: 26d999fc -s ours am: a2af18e0 -s ours am: 039afd2d -s ours am: d5057432 -s ours

am skip reason: Merged-In Ibbc220dfaf24fe5868af6396b9c7e0783421dacd with SHA-1 831a55e0 is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1847165

Change-Id: Ib0bfe84a1999f82a0f1705e239c9caae3aac7cee

[automerger skipped] Merge Android 12 am: 26d999fc -s ours am: a2af18e0 -s ours am: 039afd2d -s ours

am skip reason: Merged-In Ibbc220dfaf24fe5868af6396b9c7e0783421dacd with SHA-1 831a55e0 is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1847165

Change-Id: Iecd49f83ad1c6bb8c0ec61aac7984b550cb46064

am skip reason: Merged-In Ibbc220dfaf24fe5868af6396b9c7e0783421dacd with SHA-1 831a55e0 is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1847165

Change-Id: I66e1ed8726e08746499d951909f348ff05895ca6

am skip reason: Merged-In Ibbc220dfaf24fe5868af6396b9c7e0783421dacd with SHA-1 831a55e0 is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1847165

Change-Id: I9a3cae0877ac59b401f8086163e903c5a2b1bea3

Bug: 202323961
Merged-In: Ibbc220dfaf24fe5868af6396b9c7e0783421dacd
Change-Id: Ib5d0bdeb8c6b5fb27a48065cf13d2759aee1996d

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 831a55e0 -s ours am: 549356ed -s ours am: e3d59ebd -s ours

am skip reason: Merged-In Ie57a0453d007e6eb2d21ccbfe11888f8182ade36 with SHA-1 92aff59e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/15571753

Change-Id: I83a4aaf90d86e14fc9be34f5838fb99995f902d0

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 831a55e0 -s ours am: 549356ed -s ours

am skip reason: Merged-In Ie57a0453d007e6eb2d21ccbfe11888f8182ade36 with SHA-1 92aff59e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/15571753

Change-Id: I6ef5fa55270edd9a407624601b7d3311a446dd29

am skip reason: Merged-In Ie57a0453d007e6eb2d21ccbfe11888f8182ade36 with SHA-1 92aff59e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/15571753

Change-Id: Id95db04eef0ddb82a9936b9ee80867213dcdd243

Merged-In: Ie57a0453d007e6eb2d21ccbfe11888f8182ade36
Change-Id: Ibbc220dfaf24fe5868af6396b9c7e0783421dacd

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/14993375

Change-Id: I777cdb8653c9a978a4ded88bafddcdd3e02aa52c

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/14993375

Change-Id: I6126208222bdd8a1a55fa894d163e8f3ac1356bc

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/14993375

Change-Id: I937bd5d29534af38d632dd61e8808754a2fb9044

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/14993375

Change-Id: Ie57a0453d007e6eb2d21ccbfe11888f8182ade36

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/14993375

Change-Id: I90993ace694a20712846380bb91ff26cf854dfa8

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1730115

Change-Id: I15a82a07c8b687158e5ad580009c8308cc4a7566

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1722675

Change-Id: Iecd5236abb8fefc3bfa760b23689ffab75928c09

git log --first-parent -100 --oneline --no-decorate 8e94e02e3702..7133a44f7e88:
7133a44f7e88 FROMLIST: bootconfig: Share the checksum function with tools
8f1aabfb68a3 FROMLIST: docs: bootconfig: Update for mixing value and subkeys
849454f152a2 FROMLIST: tools/bootconfig: Support mixed value and subkey test cases
fa0f93a7b99a FROMLIST: bootconfig: Support mixing a value and subkeys under a key
cbaf3839f45f FROMLIST: bootconfig: Change array value to use child node
e24e5af12e59 FROMLIST: tools/bootconfig: Fix a build error accroding to undefined fallthrough
d2fb98f8e0bf UPSTREAM: Documentation: bootconfig: Add bootconfig override operator
46332f803557 UPSTREAM: tools/bootconfig: Store size and checksum in footer as le32
9c87d68978c6 UPSTREAM: tools/bootconfig: Align the bootconfig applied initrd image size to 4
b7e4c11093e1 UPSTREAM: tools/bootconfig: Fix errno reference after printf()
70562d727c7f UPSTREAM: tools/bootconfig: Add testcase for tailing space
7fa9026f067f UPSTREAM: tools/bootconfig: Add testcases for repeated key with brace
6f198ec43c0b UPSTREAM: tools/bootconfig: Add a script to generates bootconfig from ftrace
1fc86d2bed97 UPSTREAM: tools/bootconfig: Make all functions static
5a0151b8a112 Revert "UPSTREAM: tools/bootconfig: Fix errno reference after printf()"
6afda8ce1396 UPSTREAM: tools/bootconfig: Add list option
24a20f5cece9 UPSTREAM: tools/bootconfig: Show bootconfig compact tree from bootconfig file
4350765e582f UPSTREAM: tools/bootconfig: Add testcases for value override operator
fc15be47c97a UPSTREAM: lib/bootconfig: Add override operator support
a663daf77f54 UPSTREAM: arm64: mm: don't use CON and BLK mapping if KFENCE is enabled
e3540d29c8f7 UPSTREAM: usb: musb: Fix an error message
9ec58845f911 UPSTREAM: scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend
eee5faab05de UPSTREAM: scsi: ufs: core: Do not put UFS power into LPM if link is broken
e848d19b38de UPSTREAM: iommu: Fix a boundary issue to avoid performance drop
4098c4f18c41 UPSTREAM: udp: never accept GSO_FRAGLIST packets
212615bcbd6c UPSTREAM: udp: skip L4 aggregation for UDP tunnel packets
f3b4d24ef9ab UPSTREAM: crypto: mips: add poly1305-core.S to .gitignore
c385b07541e8 UPSTREAM: seccomp: Fix CONFIG tests for Seccomp_filters
89ff5a158f4e BACKPORT: firmware: qcom_scm: Make __qcom_scm_is_call_available() return bool
f93cecf61e10 UPSTREAM: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
297cdb219b28 UPSTREAM: crypto: poly1305 - fix poly1305_core_setkey() declaration
f0cf9cc0327c UPSTREAM: xfrm/compat: Cleanup WARN()s that can be user-triggered
7cd17a2d4033 UPSTREAM: of: property: fw_devlink: do not link ".*,nr-gpios"
c8c503a75e71 UPSTREAM: scsi: ufs: ufs-mediatek: Correct operator & -> &&
6ef502b14f60 UPSTREAM: crypto: mips/poly1305 - enable for all MIPS processors
d1c0c51c2362 UPSTREAM: kbuild: do not include include/config/auto.conf from adjust_autoksyms.sh
dfb7a2236de0 UPSTREAM: wireguard: kconfig: use arm chacha even with no neon
a6929a4a4df2 UPSTREAM: wireguard: queueing: get rid of per-peer ring buffers
fff1d4ba9bff UPSTREAM: wireguard: device: do not generate ICMP for non-IP packets
b2d9cad5f6c6 UPSTREAM: wireguard: selftests: test multiple parallel streams
cf64223623e7 UPSTREAM: ext: EXT4_KUNIT_TESTS should depend on EXT4_FS instead of selecting it
d9834e28c3be UPSTREAM: kunit: tool: fix unintentional statefulness in run_kernel()
299c57094df4 UPSTREAM: kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir
cc3c1b9140b1 UPSTREAM: regulator: qcom-rpmh: fix build after QCOM_COMMAND_DB is tristate
f6f891276be5 UPSTREAM: net/vmw_vsock: fix NULL pointer dereference
8a819d0a37b9 UPSTREAM: udp: ipv4: manipulate network header of NATed UDP GRO fraglist
7492a5e6bfc9 UPSTREAM: scsi: ufs: Fix possible power drain during system suspend
83ffd1a84016 UPSTREAM: net: fix use-after-free when UDP GRO with shared fraglist
9c0e809bcca7 UPSTREAM: scsi: ufs: Re-enable WriteBooster after device reset
a7fe28a43ee3 UPSTREAM: dma-buf: cma_heap: Include linux/vmalloc.h to fix build failures on MIPS
b49787f3cd69 UPSTREAM: crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager
55efe793f42f UPSTREAM: net: xfrm: fix memory leak in xfrm_user_policy()
8c476c55b953 UPSTREAM: xfrm/compat: Don't allocate memory with __GFP_ZERO
0e0146a85e2f UPSTREAM: xfrm/compat: memset(0) 64-bit padding at right place
9fd530c57160 UPSTREAM: xfrm/compat: Translate by copying XFRMA_UNSPEC attribute
0f20313e3c04 UPSTREAM: tools/bootconfig: Fix to check the write failure correctly
7a536664130a UPSTREAM: tools/bootconfig: Fix errno reference after printf()
7f72cb899db7 BACKPORT: vsock: forward all packets to the host when no H2G is registered
139eaff6d4ef UPSTREAM: sched/fair: Prefer prev cpu in asymmetric wakeup path
b743a037e7cc UPSTREAM: scsi: ufshcd: Fix missing destroy_workqueue()
ace896f57d15 UPSTREAM: bootconfig: Extend the magic check range to the preceding 3 bytes
1c6b62ebc76f UPSTREAM: kunit: Don't fail test suites if one of them is empty
6c11534bfad8 UPSTREAM: lib/bootconfig: Fix to remove tailing spaces after value
8ea6c52c5bee UPSTREAM: lib/bootconfig: Fix a bug of breaking existing tree nodes
155a75c7128b UPSTREAM: vsock: fix potential null pointer dereference in vsock_poll()
1018a3fab9bb UPSTREAM: bootconfig: Fix to find the initargs correctly
5c4e18ffda7e BACKPORT: kunit: kunit_config: Fix parsing of CONFIG options with space
28724a57b512 BACKPORT: net: ethtool: add missing NETIF_F_GSO_FRAGLIST feature string
fbbaaeb3a886 UPSTREAM: media: v4l2-ctrls: Unset correct HEVC loop filter flag
d902edd7d938 UPSTREAM: vsock/vmci: make vmci_vsock_transport_cb() static
9eb500f26e50 UPSTREAM: ubsan: entirely disable alignment checks under UBSAN_TRAP
f12db78b4af7 UPSTREAM: ubsan: disable UBSAN_ALIGNMENT under COMPILE_TEST
c93fb102effe UPSTREAM: mac80211_hwsim: use GFP_ATOMIC under spin lock
9511cf7eb082 UPSTREAM: iommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map()
ad15ee21ab3c UPSTREAM: vsock/vmci: make vmci_vsock_cb_host_called static
b0b664ad1351 ANDROID: GKI: update .xml file
46704c82ae2f ANDROID: restore abi breakage in usbnet.h
6cb0d5ef8b38 Merge 5.4.125 into android12-5.4
e5f6b8e5e384 ANDROID: ABI: update symbols to unisoc whitelist for the ninth time
756274322205 ANDROID: GKI: update symbol list for allwinner device.
a723afff585d UPSTREAM: wireguard: allowedips: free empty intermediate nodes when removing single node
b95baf132358 UPSTREAM: wireguard: allowedips: allocate nodes in kmem_cache
c6d67355874a UPSTREAM: wireguard: selftests: remove old conntrack kconfig value
b2788ffd3233 UPSTREAM: wireguard: allowedips: remove nodes in O(1)
051f67c302de UPSTREAM: wireguard: allowedips: initialize list head in selftest
48f07e3feb94 UPSTREAM: wireguard: selftests: make sure rp_filter is disabled on vethc
14c780fa64b9 BACKPORT: media: Kconfig: DVB support should be enabled for Digital TV
da2bdad0afd8 UPSTREAM: wireguard: use synchronize_net rather than synchronize_rcu
726f92ee9331 UPSTREAM: wireguard: do not use -O3

Test: treehugger
Bug: 191211216
Change-Id: If280153fc3ce08e755e40ba2ce59fc87ebd0d32f

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1715705

Change-Id: I87b0c05f6530515604b0d2eaeccdf68b993d5e50

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1730115

Change-Id: I0bf7b34a5a8f2b3a98c26346f44250ae19f0437c

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1722675

Change-Id: I9aae7966e9d97f4340ee9330ae1719c3a696d025

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1715705

Change-Id: I34822d18627d6fb434d7cf6b5d90f0cb31ddb3a9

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1730115

Change-Id: Id2efb0c93443a519570af5a4b3d36280361b4e9b

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1722675

Change-Id: Id47ea62240d0714529e04d52e9829784e6c56774

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1715705

Change-Id: I0cec052badb7b0ba51aa6e815d03ef6516e29f05

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1708176

Change-Id: I535b920ceebaf2fbb838dc20d761dfe79de0393f

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1708176

Change-Id: Icf5845d71c121154447cfb3a7e7b40c27076648d

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1699578

Change-Id: I6291c5d440e09aaef08399e52a07d5fee721bfee

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1699578

Change-Id: I3e7497ef6686c006dcdfe34fabd23183e70d2535

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1693487

Change-Id: Ic99b77e1c020b57c5ceac50f88aeaa0a7cf662a4

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1687586

Change-Id: I981e9ca01d64f0378cd2d88c437ba776d2636473

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1693487

Change-Id: I0c389019077998bdc1256a10ca41f00552329baf

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1687586

Change-Id: I3a2ca59122196105b729aa719ac6f02c34b0bd13

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1671808

Change-Id: I2c8405acdf287243268d63c160930f83d2b23238

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1659679

Change-Id: I9bc6cdb9627a21ef99519fce9df8b2efd25b236d

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1671808

Change-Id: Ibc98226ddf18378493006da70d94476c2a2c16f2

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1659679

Change-Id: I890f2fb7fa85428b687cbdf3608461592de44507

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1651614

Change-Id: I0f6a4e886a016ddf1f9116a75617758b39f6a5b3

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1651614

Change-Id: I6c8352de51f11fee76eafa42f9c7d72df64cb08a

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1641840

Change-Id: If12d31a346f02b299592a783e8e6fb6eadcb7aad

Merge "Update kernel to builds 7199022 am: c0405cd8 am: 082bfcf9 am: 8ceef7bf am: 54472176" into sc-v2-dev-plus-aosp