* refs/heads/tmp-f70b9a6:
ANDROID: Fips 140: move fips symbols entirely in own list
ANDROID: core of xt_IDLETIMER send_nl_msg support
ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
ANDROID: add fips140.ko symbols to module ABI
ANDROID: inject correct HMAC digest into fips140.ko at build time
ANDROID: crypto: fips140 - perform load time integrity check
FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
ANDROID: arm64: simd: omit capability check in may_use_simd()
ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
ANDROID: arm64: only permit certain alternatives in the FIPS140 module
ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
UPSTREAM: arm64: mm: don't use CON and BLK mapping if KFENCE is enabled
UPSTREAM: x86/build: Fix location of '-plugin-opt=' flags
UPSTREAM: binder: Return EFAULT if we fail BINDER_ENABLE_ONEWAY_SPAM_DETECTION
UPSTREAM: usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe()
UPSTREAM: usb: dwc3: core: Add missing GHWPARAMS9 doc
UPSTREAM: KVM: arm64: Fix error return code in init_hyp_mode()
UPSTREAM: KVM: arm64: Support PREL/PLT relocs in EL2 code
UPSTREAM: iommu/mediatek: Always enable the clk on resume
UPSTREAM: mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1
UPSTREAM: dt-bindings: iommu: mediatek: update mediatek,iommu.yaml references
UPSTREAM: media: mtk: fix mtk-smi dependency
UPSTREAM: software node: Allow node addition to already existing device
UPSTREAM: coresight: etm-perf: Fix define build issue when built as module
UPSTREAM: kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled
UPSTREAM: kunit: tool: Disable PAGE_POISONING under --alltests
UPSTREAM: gpiolib: Fix error return code in gpiolib_dev_init()
UPSTREAM: memblock: fix section mismatch warning
UPSTREAM: software node: Fix device_add_software_node()
UPSTREAM: gpio: fix NULL-deref-on-deregistration regression
BACKPORT: kbuild: fix UNUSED_KSYMS_WHITELIST for Clang LTO
UPSTREAM: kbuild: lto: add _mcount to list of used symbols
UPSTREAM: arm64: Add missing ISB after invalidating TLB in enter_vhe
UPSTREAM: kbuild: Move .thinlto-cache removal to 'make clean'
UPSTREAM: parisc: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
UPSTREAM: kbuild: prevent CC_FLAGS_LTO self-bloating on recursive rebuilds
UPSTREAM: regulator: qcom-rpmh: fix build after QCOM_COMMAND_DB is tristate
UPSTREAM: dma-buf: cma_heap: Include linux/vmalloc.h to fix build failures on MIPS
UPSTREAM: signal/parisc: Remove parisc specific definition of __ARCH_UAPI_SA_FLAGS
UPSTREAM: nl80211: fix kernel-doc warning in the new SAE attribute
ANDROID: abi_gki_aarch64_qcom: Add cpuidle_psci and gic_resume symbols
ANDROID: gic-v3: Export gic_resume() for vendor GIC enhancements
ANDROID: cpuidle-psci: Add vendor hook for cpuidle psci enter and exit
FROMGIT: usb: typec: mux: Fix copy-paste mistake in typec_mux_match
FROMGIT: usb: typec: ucsi: Clear PPM capability data in ucsi_init() error path
ANDROID: export cpuset_cpus_allowed()for GKI purpose.
ANDROID: GKI: Update abi_gki_aarch64_qcom list for shmem reclaim
ANDROID: tracing: Add generic flag for register tracing disable
ANDROID: user: Add vendor hook to user for GKI purpose
ANDROID: mm: allow fast reclaim of shmem pages
ANDROID: vendor_hooks: Export the tracepoints sched_stat_sleep and sched_waking to let module probe them
Conflicts:
Documentation/devicetree/bindings
Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
Documentation/devicetree/bindings/media/mediatek-mdp.txt
Documentation/devicetree/bindings/media/mediatek-vcodec.txt
Change-Id: Ic22894ca2604f1bc7efea81204c41e2e5593defc
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
274d37a14a