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

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



Catch the -lts branch up with the recent changes made in android15-6.6:

* cfc94dc0 Merge tag 'android15-6.6.87_r00' into android15-6.6
* 89643073 ANDROID: add USERFAULTFD back to microdroid
* 66459e79 ANDROID: Repurpose a reserved slot in ipv6_devconf for backports
* 33e1555f ANDROID: GKI: Update symbol list for mtk
* 3ea1be5b ANDROID: GKI: update symbol list file for xiaomi
* 9743210e BACKPORT: mm/page_alloc: keep track of free highatomic
* b9e2be44 UPSTREAM: mm: page_alloc: fix highatomic typing in multi-block buddies
* bc1e3097 BACKPORT: mm: page_alloc: batch vmstat updates in expand()
* 3dc79460 BACKPORT: mm: page_alloc: consolidate free page accounting
* f15ddfd3 BACKPORT: mm: page_isolation: prepare for hygienic freelists
* a0fe7bbc UPSTREAM: mm: page_alloc: set migratetype inside move_freepages()
* 7bd0ba08 BACKPORT: mm: page_alloc: close migratetype race between freeing and stealing
* 4e814d99 UPSTREAM: mm: page_alloc: fix freelist movement during block conversion
* 24d6337d UPSTREAM: mm: page_alloc: fix move_freepages_block() range error
* fd83b273 UPSTREAM: mm: page_alloc: move free pages when converting block during isolation
* 4792c30b UPSTREAM: mm: page_alloc: fix up block types when merging compatible blocks
* 6a56d219 BACKPORT: mm: page_alloc: remove pcppage migratetype caching
* 38795947 ANDROID: Set ALL_KMI_SYMBOLS to CONFIG_UNUSED_KSYMS_WHITELIST.
* 28584d68 ANDROID: Move 6.6 AutoFDO profile to android/gki/aarch64/afdo
* b495f54c UPSTREAM: exfat: call bh_read in get_block only when necessary
* 3d9e0194 UPSTREAM: exfat: fix potential wrong error return from get_block
* 0e60a8de BACKPORT: FROMGIT: dm-bufio: don't schedule in atomic context
* 8a34ab3c Revert "mm: resolve faulty mmap_region() error path behaviour"
* a3b47b4b UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT
* 041551be ANDROID: turn more configs off for microdroid kernel
* 9acf2a05 ANDROID: turn more configs for microdroid kernel
* fea3e8f8 ANDROID: turn CONFIG_EXPERT for microdroid kernels
* eb4b900b ANDROID: re-run savedefconfig for microdroid kernels
* 1f04c5fc FROMGIT: f2fs: zone: fix to avoid inconsistence in between SIT and SSA
* 22fde3e0 FROMGIT: f2fs: prevent the current section from being selected as a victim during GC
* 4741ef5c FROMGIT: f2fs: clean up unnecessary indentation
* eed9b149 FROMGIT: cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
* ced9dc16 UPSTREAM: PCI/ASPM: Fix L1SS saving
* 57d2e22d ANDROID: Update the ABI symbol list
* 3fb23823 ANDROID: fs: Add vendor hooks for ep_create_wakeup_source & timerfd_create
* 5b82c86f ANDROID: Add CtsJobSchedulerTestCases to the presubmit group.
* cc59263d ANDROID: fuse-bpf: fix wrong logic in read backing
* 8dedd2a3 ANDROID: GKI: Update oplus symbol list
* 26c67c44 ANDROID: madvise: add vendor hook to bypass madvise
* 08ca8785 ANDROID: virtio_balloon: sysfs-configurable option bail_on_out_of_puff
* ffe47cde ANDROID: abi_gki_aarch64_honor: whitelist symbols added percpu_ref_is_zero
* 6d50a5ff UPSTREAM: bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags
* 4f551093 UPSTREAM: regset: use kvzalloc() for regset_get_alloc()
* 65855f07 ANDROID: fips140: strip debug symbols from fips140.ko
* 76b10136 ANDROID: 16K: Add VMA padding size to smaps output
* 04053bc9 ANDROID: 16K: Don't copy data vma for maps/smaps output
* 9be2a46a ANDROID: export of_find_gpio.
* 422790d8 ANDROID: GKI: Update oplus symbol list
* 43bf81d1 ANDROID: mm: add vendor hooks for file folio reclaim.
* 138801b0 Revert "ANDROID: f2fs: add kernel message"
* ab3ef532 Revert "ANDROID: f2fs: introduce sanity_check sysfs entry"
* af63db2f UPSTREAM: usbnet:fix NPE during rx_complete
* f77653a6 BACKPORT: FROMGIT: scsi: ufs: core: Fix a race condition related to device commands
* 1a45ce72 ANDROID: KVM: iommu: Restrict access KVM_IOMMU_DOMAIN_IDMAP_ID
* fbc642bc ANDROID: Add IFTTT analyzer markers for GKI modules
* 18cdf164 FROMGIT: usb: dwc3: gadget: Prevent irq storm when TH re-executes
* cd2fcd02 FROMGIT: KVM: arm64: Use acquire/release to communicate FF-A version negotiation
* c56c6455 ANDROID: KVM: arm64: Fix missing poison for huge-mapping
* 272829b2 ANDROID: define python library in BUILD for kunit parser
* b41825e8 ANDROID: KVM: arm64: Add pkvm module guest_stage2_pa
* 340ef6cb ANDROID: KVM: arm64: Add smc64 trap handling for protected guests
* 139cbbb5 ANDROID: GKI: Add symbols to symbol list for oppo
* 54584a51 ANDROID: kthread: Export kthread_blkcg
* 05baf38a ANDROID: sbitmap: Fix sbitmap_spinlock()
* 42a23db4 ANDROID: usb: xhci-plat: vendor hooks for suspend and resume
* 78c3f3bc FROMGIT: kasan: Add strscpy() test to trigger tag fault on arm64
* b5223b5d FROMGIT: string: Add load_unaligned_zeropad() code path to sized_strscpy()
* cfee73c1 FROMGIT: exfat: fix random stack corruption after get_block
* 0847f904 UPSTREAM: exfat: short-circuit zero-byte writes in exfat_file_write_iter
* 74e81110 UPSTREAM: exfat: fix file being changed by unaligned direct write
* b4b52b9a BACKPORT: exfat: do not fallback to buffered write
* 41018b0b UPSTREAM: exfat: drop ->i_size_ondisk
* 503f6b71 UPSTREAM: mm/damon/core: use nr_accesses_bp as a source of damos_before_apply tracepoint
* 752281ca UPSTREAM: mm/damon/sysfs-schemes: use nr_accesses_bp as the source of tried_regions/<N>/nr_accesses
* 1940b7c6 UPSTREAM: mm/damon/core: make DAMOS uses nr_accesses_bp instead of nr_accesses
* b4537fa4 UPSTREAM: mm/damon/core: mark damon_moving_sum() as a static function
* 251e8ac6 UPSTREAM: mm/damon/core: skip updating nr_accesses_bp for each aggregation interval
* 5a8bcac5 UPSTREAM: mm/damon/core: use pseudo-moving sum for nr_accesses_bp
* a32703d7 BACKPORT: mm/damon/core: introduce nr_accesses_bp
* 02ec8575 UPSTREAM: mm/damon/core-test: add a unit test for damon_moving_sum()
* dda6109d UPSTREAM: mm/damon/core: implement a pseudo-moving sum function
* 99418349 UPSTREAM: mm/damon/vaddr: call damon_update_region_access_rate() always
* 6c3ca340 BACKPORT: mm/damon/core: define and use a dedicated function for region access rate update
* cfc20af5 UPSTREAM: mm/damon/core: add a tracepoint for damos apply target regions
* 02eeb072 BACKPORT: scsi: ufs: core: Set the Command Priority (CP) flag for RT requests
* 1a7fea5f BACKPORT: FROMGIT: dm-verity: support block number limits for different ioprio classes
* 1a7680db ANDROID: 16K: Emulate cachestat counters
* 622c3fd0 ANDROID: Add pcie-designware.h to aarch64 allowlist
* b62ea68f ANDROID: GKI: Update oplus symbol list
* 52e82fb4 ANDROID: vendor_hook: add hooks for I/O priority
* eafcd29b ANDROID: GKI: db845c: Add _totalram_pages to symbol list
* 0a83367c ANDROID: GKI: virtual_device: Add _totalram_pages to symbol list
* bbf1176b ANDROID: dma-buf/heaps: system_heap: avoid too much allocation
* 662edcf4 BACKPORT: tcp: fix forever orphan socket caused by tcp_abort
* a1b49995 BACKPORT: tcp: fix races in tcp_abort()

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