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

Merge branch 'android15-6.6' into branch 'android15-6.6-lts'



This catches the -lts branch up with recent abi changes and other symbol
additions.  Included in here are the following commits:

* af0b7d88 ANDROID: ABI: Update pixel symbol list
* d3cf5eb7 UPSTREAM: freezer,sched: Clean saved_state when restoring it during thaw
* 1da401e4 UPSTREAM: freezer,sched: Do not restore saved_state of a thawed task
* bb064dd1 ANDROID: Improve module loader checks for GKI symbol protection
* 9acf2ada ANDROID: GKI: update symbol list file for xiaomi
* 97a274d2 FROMGIT: arm64: mte: Make mte_check_tfsr_*() conditional on KASAN instead of MTE
* 52a033e8 ANDROID: KVM: arm64: Move init after setting the ops
* abd6c25f ANDROID: KVM: arm64: iommu: Add idmap trace point
* ce6eb6fa ANDROID: KVM: arm64: Fix prot for __pkvm_host_use_dma_page
* 9c451cdb ANDROID: KVM: arm64: iommu: Allow NULL domains in kvm_iommu_host_stage2_idmap
* 65217ef2 ANDROID: KVM: arm64: iommu: Allocate IDMAPPED domain from the driver
* 139e603e ANDROID: drivers/arm-smmu-v3-kvm: Remove smmu from kvm_arm_smmu_topup_memcache
* aa2f788d ANDROID: ABI: Update symbol for Exynos SoC
* 8ea15a56 ANDROID: GKI: init vendor data in __init_rwsem
* fa174340 ANDROID: Define common set of cflags for kselftests
* 4a43fd06 ANDROID: Remove obsolete -DKTEST flag from timers selftests
* d564ca17 ANDROID: Build with -D_GNU_SOURCE= to avoid redefinition warnings
* cb58ac06 ANDROID: Quash macro redefinition warnings for mm/thuge-gen
* 0e3f9336 ANDROID: Don't build with mlock2.h
* cff45068 ANDROID: 16K: Only check basename of linker context
* e5ee6d1d UPSTREAM: scsi: ufs: core: mcq: Fix ufshcd_mcq_sqe_search()
* 96498cee ANDROID: 16K: Ensure stack expansion size is __PAGE_SIZE multiple
* 2d8f89ca ANDROID: 16K: Only support page size emulation for x86_64
* fece38d6 ANDROID: abi_gki_aarch64_vivo: Update symbol list
* 3a8cfce0 ANDROID: vendor_hooks: add hooks to fix priority inversion
* f933d260 ANDROID: 16K: Avoid and document padding madvise lock warning
* b59218bd ANDROID: KVM: arm64: activate FGT trapping for pvms
* b578ac0e ANDROID: KVM: arm64: Add fgt trap masks for pKVM but do not activate them yet
* e7abba54 ANDROID: KVM: arm64: Mark PAuth as a restricted feature for protected VMs
* 991bca29 ANDROID: KVM: arm64: speacialize and move __activate_traps_hcrx out of __activate_traps_common
* 289f66c4 ANDROID: KVM: arm64: move __deactivate_traps_hfgxtr out of __deactivate_traps_common
* bcbca2e5 ANDROID: KVM: arm64: move __activate_traps_hfgxtr out of __activate_traps_common
* 96aa0305 ANDROID: KVM: arm64: Allow FEAT_ATS1A for Protected VMs
* b0469553 ANDROID: KVM: arm64: Trap external trace for protected VMs
* 79358f32 ANDROID: KVM: arm64: Fix which features are marked as allowed for protected VMs
* 10434a62 ANDROID: GKI: Add symbols to allowed list for galaxy
* 58ebfa38 UPSTREAM: usb: dwc3: core: Add DWC31 version 2.00a controller
* 7511c3ab ANDROID: arm64: vdso32: support user-supplied flags
* 44657077 ANDROID: vendor_hooks: add hook in f2fs_file_open()
* 35cb2a40 ANDROID: gki_defconfig: Set CONFIG_DTPM/CONFIG_DTPM_CPU/CONFIG_DTPM_DEVFREQ into y
* 82df2375 UPSTREAM: block/blk-mq: Don't complete locally if capacities are different
* 49691a67 BACKPORT: sched: Add a new function to compare if two cpus have the same capacity
* 67848ad2 ANDROID: vendor_hooks: add symbols for lazy preemption
* 73e65037 ANDROID: GKI: update symbol list for honor
* 86dd8955 ANDROID: GKI: net: add vendor hooks for link data path
* 3f6eaa6a ANDROID: vendor_hooks: add two hooks for lazy preemption
* 858a5483 FROMLIST: time/sched_clock: Export sched_clock_register()
* 08901ec9 ANDROID: Add specific kselftests in the selftests source code directory.
* 7fb8bc8a ANDROID: Update the ABI symbol list for Pixel
* c5d01a3f ANDROID: vendor_hooks: Export direct reclaim trace points
* d5e6efdc ANDROID: virt: gunyah: Update protype for platform hooks
* 741c7f29 ANDROID: block: fix non po2 support of blk-zoned device
* 392fd3aa UPSTREAM: regmap-i2c: Subtract reg size from max_write
* 2b549fbb ANDROID: GKI defconfig: append "-4k" to UTS
* fe188b34 ANDROID: iommu/arm-smmu-v3-kvm: Implement reserved regions callback
* 23b6831c ANDROID: Add all green kselftests in TEST_MAPPING in common/ directory
* 9fbe656e ANDROID: GKI: Update oplus symbol list
* d3585a64 FROMLIST: lockdep: fix deadlock issue between lockdep and rcu
* 69f834b4 ANDROID: GKI: Update QCOM symbol list
* a0af19d4 Revert "ANDROID: GKI: Disable KUnit built-in testing"
* 4ca4a2f3 UPSTREAM: genirq/irqdesc: Prevent use-after-free in irq_find_at_or_after()
* c5ed0f8b ANDROID: abi_gki_aarch64_qcom: update abi symbols
* bfb3d6d4 ANDROID: tracing: Add restricted vendor hooks for preemptirq events
* 4bdc9764 ANDROID: 2024/06/05 KMI update
* 96532f83 UPSTREAM: mm: optimize CONFIG_PER_VMA_LOCK member placement in vm_area_struct
* 7789c9e4 ANDROID: fs: Add ANDROID OEM DATA ARRAY in struct bdi_writeback
* de090207 ANDROID: ABI: Update symbol for Exynos SoC
* 8fc5b8f0 ANDROID: GKI: Add symbol to symbol list for imx
* eb1aa949 UPSTREAM: of: Reimplement of_machine_is_compatible() using of_machine_compatible_match()
* dcc17090 UPSTREAM: of: Change of_machine_is_compatible() to return bool
* f589c195 UPSTREAM: of: Add of_machine_compatible_match()
* f9fbf393 FROMGIT: firmware: arm_scmi: Add basic support for SCMI v3.2 pincontrol protocol
* 14e0e2ab FROMGIT: dt-bindings: firmware: Support SCMI pinctrl protocol
* 5ea96c25 FROMGIT: firmware: arm_scmi: Introduce get_max_msg_size() helper/accessor
* ffb70eb8 FROMGIT: firmware: arm_scmi: Add protocol versioning checks
* 69acf8ab FROMGIT: firmware: arm_scmi: Increase the maximum opp count in the perf protocol
* 9ede5465 FROMLIST: firmware: arm_scmi: mailbox: support P2A channel completion
* 99c333ba FROMLIST: dt-bindings: firmware: arm,scmi: Support notification completion channel
* 0b38c5c2 FROMGIT: firmware: arm_scmi: Implement clock get permissions
* 839994cd FROMGIT: firmware: arm_scmi: Rework clock domain info lookups
* 6cbd5597 ANDROID: GKI: enable CONFIG_BLK_CGROUP_IOCOST
* 5b6dc394 FROMGIT: hwspinlock: Introduce hwspin_lock_bust()
* 7fc172b7 ANDROID: abi_gki_aarch64_qcom: Add abi symbols
* 29460fac FROMLIST: mmc: sdhci-msm: Enable force hw reset during cqe recovery
* 773b49c9 ANDROID: vendor_hooks: Add hook in wakeup functionality
* b7bdc38a FROMLIST: mmc: core: Introduce new flag to force hardware reset
* a8fe5ae5 ANDROID: mmc: core: Export core functions required for clk scaling
* 75892d27 ANDROID: mmc: core: Export core functions for kernel modules usage
* 46fb90cb ANDROID: KVM: arm64: Don't always update IOMMUs from module_change_host_page_prot
* 11b80166 ANDROID: GKI: remove CONFIG_KEXEC_FILE
* b9888dee UPSTREAM: cgroup: Avoid false cacheline sharing of read mostly rstat_cpu
* 571591d5 UPSTREAM: cgroup/rstat: Optimize cgroup_rstat_updated_list()
* b4958d2b UPSTREAM: cgroup/rstat: Reduce cpu_lock hold time in cgroup_rstat_flush_locked()
* 9d925add UPSTREAM: mm: memcg: optimize parent iteration in memcg_rstat_updated()
* 38aad838 BACKPORT: mm: memcg: restore subtree stats flushing
* 8bb30a7d UPSTREAM: mm: workingset: move the stats flush into workingset_test_recent()
* 5b61b798 UPSTREAM: mm: memcg: make stats flushing threshold per-memcg
* 84b2003d BACKPORT: mm: memcg: move vmstats structs definition above flushing code
* 01d12c8b UPSTREAM: mm: memcg: change flush_next_time to flush_last_time
* a38b207d ANDROID: GKI: set vfs-only exports into their own namespace
* ab20fe05 UPSTREAM: binder: fix max_thread type inconsistency
* cfeefa31 ANDROID: GKI: add wait_for_completion_interruptible_timeout to db845c symbol list
* e2b7d397 UPSTREAM: slimbus: qcom-ngd-ctrl: Add timeout for wait operation
* b37bc91b UPSTREAM: mtd: limit OTP NVMEM cell parse to non-NAND devices
* c7d1588e UPSTREAM: nvmem: add explicit config option to read old syntax fixed OF cells
* b8f693a7 ANDROID: ABI: Update pixel symbol list
* 77828e5a ANDROID: virt: geniezone: Align the gzvm driver with mainline v11
* f6cbf65f FROMLIST: dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor
* 9b6ec311 Revert "FROMLIST: dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor"
* ee58017a ANDROID: KVM: arm64: Enforce type check for pkvm_register_el2_call()
* 12fcfb3d Revert "FROMLIST: selftests/vDSO: change elf_hash parameter to signed char"
* ccc2b557 ANDROID: ABI: Add usb_gadget_connect & usb_gadget_disconnect symbol
* 94c879bf ANDROID: ABI: update Unisoc symbol list for dm-verity ko
* 9f2773a8 UPSTREAM: swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
* 4c747cf7 ANDROID: abi_gki_aarch64_qcom: Add iio abi symbol
* 590c5bb0 FROMLIST: selftests/vDSO: change elf_hash parameter to signed char
* ff23df52 ANDROID: abi_gki_aarch64_qcom: Add clk_restore_context and clk_save_context
* 3f807312 ANDROID: GKI: update xiaomi symbol list
* e52e165c ANDROID: psi: Add vendor hooks for PSI tracing
* 1113cfd8 ANDROID: vendor_hooks:vendor hook for madvise_cold_or_pageout_pte_range.
* dedfeb0f ANDROID: vendor_hooks:vendor hook for mmput
* a494753f ANDROID: GKI: Update Honor abi symbol list
* 413bd757 ANDROID: Allow vendor modules perform more operationson.
* 4bde1dfd UPSTREAM: procfs: make freeing proc_fs_info rcu-delayed
* 72e9e1d6 UPSTREAM: procfs: move dropping pde and pid from ->evict_inode() to ->free_inode()
* eab28aad Revert "FROMLIST: sched: Consolidate cpufreq updates"
* ddc5d879 ANDROID: GKI: Update QCOM symbol list
* 9a65b2f5 ANDROID: ABI: update symbol list for galaxy
* de8582f7 ANDROID: ABI fixup for abi break in struct dst_ops
* 3521eb17 BACKPORT: net: fix __dst_negative_advice() race

Change-Id: I61ce1d58f076b3dd166f20b8fbe4c0448c272743
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 693e0578 af0b7d88
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment