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

Merge android15-6.6 into android15-6.6-lts



This merges the android15-6.6 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 67ac4517 Merge tag 'android15-6.6.100_r00' into android15-6.6
* 2aeb1e4f ANDROID: GKI: add fair task core selection logic vendor hooks.
* fdc5abc0 ANDROID: PM: Support to abort suspend during filesystem sync
* f596be29 ANDROID: KVM: arm64: Configure size of pKVM linear map on the cmdline
* 18741a35 ANDROID: KVM: arm64: Handle hyp s1 allocation failures gracefully
* 75a6bad6 ANDROID: ABI: Update pixel symbol list
* 674f9ca4 ANDROID: ABI: Update the symbol list for galaxy
* 45c7d3be ANDROID: ABI: refresh, CRC fixups and allowed breaks
* 57af9b05 ANDROID: Track per-process dmabuf PSS
* 572dc7ff ANDROID: Add dmabuf RSS trace event
* ca715bcc ANDROID: ABI: refresh, CRC fixups and allowed breaks
* 09fc7b63 ANDROID: Track per-process dmabuf RSS HWM
* 857c6e06 ANDROID: Track per-process dmabuf RSS
* 104a03ad ANDROID: add task_dma_buf_record and allocation preload facilities
* deae7333 ANDROID: crashdump_defconfig: CONFIG_DMA_RESTRICTED_POOL=y
* 8f898963 BACKPORT: selftests/bpf: Add test for open coded dmabuf_iter
* 9edd9b6f BACKPORT: selftests/bpf: Add test for dmabuf_iter
* 76e74b6a UPSTREAM: selftests/bpf: Add ASSERT_OK_FD macro
* 755db8b1 BACKPORT: bpf: Add open coded dmabuf iterator
* 8817f190 BACKPORT: bpf: Add dmabuf iterator
* 23dc7cf0 BACKPORT: dma-buf: Rename debugfs symbols
* b06175e3 BACKPORT: dma-buf: Do not build debugfs related code when !CONFIG_DEBUG_FS
* 188842d0 UPSTREAM: f2fs: zone: wait for inflight dio completion, excluding pinned files read using dio
* 76e9166a ANDROID: GKI: Add symbol to symbol list for imx
* ef85a205 BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode
* fbf54225 BACKPORT: FROMGIT: f2fs: add lookup_mode mount option
* 78b358dd ANDROID: Fix build error in linker_ctx() when CONFIG_PER_VMA_LOCK=n
* ef2e2217 ANDROID: KVM: arm64: Fix hyp_alloc() upper size check
* dfa29d07 ANDROID: KVM: arm64: Fix hyp_pool::free_pages
* 9381f5d6 ANDROID: 16K: Fallback to mmap lock for linker context VMA lookup
* 6a406fcc Reapply "mm: resolve faulty mmap_region() error path behaviour"
* d523c74e UPSTREAM: maple_tree: fix MA_STATE_PREALLOC flag in mas_preallocate()
* bf7b46c0 ANDROID: 16K: Allocate pad vma on the stack
* 179b6803 Revert "ANDROID: 16K: Use vma_area slab cache for pad VMA"
* 4dba9f2a ANDROID: GKI: defconfig: Enable a few zram configs
* 523e00ec ANDROID: mm: fix locking in do_madvise() when CONFIG_MEMORY_FAILURE=y
* 67c79593 ANDROID: GKI: Update symbol list for Pixel Watch
* 41aa8cef ANDROID: ABI: Update the symbol list for mtk
* 8ed377e0 Revert "ANDROID: add task_dma_buf_record and allocation preload facilities"
* 4f5becd3 Revert "ANDROID: Track per-process dmabuf RSS"
* 18b556c0 Revert "ANDROID: Track per-process dmabuf RSS HWM"
* 6076ad87 Revert "ANDROID: Track per-process dmabuf PSS"
* 4befbef4 Revert "ANDROID: fixup task_struct to avoid ABI breakage"
* 979ba274 Revert "ANDROID: fixup dma_buf struct to avoid ABI breakage"
* 0647f59d Revert "ANDROID: Add dmabuf RSS trace event"
* e769b256 Revert "ANDROID: fix dmabuf accounting deadlock issue"
* 055e401a Revert "ANDROID: fix dmabuf accounting lockdep checking"
* 1f7d799f BACKPORT: iommu/of: Support ats-supported device-tree property
* 761894ba UPSTREAM: PCI: Use preserve_config in place of pci_flags
* 5a13b8c5 UPSTREAM: PCI: Unify ACPI and DT 'preserve config' support
* 9299af8e UPSTREAM: PCI: of: Add of_pci_preserve_config() for per-host bridge support
* 30c2e0f0 BACKPORT: PCI: Move PRESERVE_BOOT_CONFIG _DSM evaluation to pci_register_host_bridge()
* 0b29a752 ANDROID: ABI: Update the symbol list for mtk
* c4bae9d4 Reapply "BACKPORT: mm: add swappiness= arg to memory.reclaim"
* 20320a82 Revert "BACKPORT: mm: add swappiness= arg to memory.reclaim"
* ea3d9795 BACKPORT: mm: add swappiness= arg to memory.reclaim
* 4bbca5e7 BACKPORT: mm: add defines for min/max swappiness
* d47451aa UPSTREAM: tls: always refresh the queue when reading sock
* ef3981dc ANDROID: vendor_hooks: add vendor hooks for bio_add_page_merge_bypass
* 3b6fab0f ANDROID: KVM: Enforce hyp requests alignment
* f66b7991 UPSTREAM: usb: gadget: uvc: Initialize frame-based format color matching descriptor

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