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

Merge android16-6.12 into android16-6.12-lts



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

It contains the following commits:

*   e7ac44a8 Merge android16-6.12-kminext into android16-6.12
|\
| *   bdc81b76 Merge android16-6.12 into android16-6.12-kminext
| |\
| * | 8979fee4 Merge android16-6.12 into android16-6.12-kminext
| * | 889d5333 ANDROID: bump KMI generation number
| * | 6bd342e2 Merge android16-6.12 into android16-6.12-kminext
| * | 5b4fa14e Merge android16-6.12 into android16-6.12-kminext
| * | c2b5f378 Merge android16-6.12 into android16-6.12-kminext
| * | eca8cc24 ANDROID: relist android_vh_f2fs_printk and android_vh_f2fs_set_bio_flag symbols
| * | cf07f201 ANDROID: vendor_hooks: Refactor f2fs_submit_folio_write and trace_android_vh_f2fs_printk hooks
| * | 49313342 ANDROID: delist f2fs_submit_folio_write and android_vh_f2fs_printk symbols
| * | 071fb58c ANDROID: Update ABI after preserving old h_nr_running for KMI source compatability
| * | 9670063f ANDROID: Re-add cfs_rq.h_nr_running element for KMI compatability
| * | 8e86454f ANDROID: GKI: Enable 32-bit userspace x_tables support
| * | 2f7b8701 ANDROID: GKI: update the abi due to reverts being re-applied
| * | cc5b85ad UPSTREAM: PCI: Honor Max Link Speed when determining supported speeds
| * | 96ff8d53 UPSTREAM: PCI/ACPI: Fix runtime PM ref imbalance on Hot-Plug Capable ports
| * | fb967283 UPSTREAM: PCI: Allow PCI bridges to go to D3Hot on all non-x86
| * | 57f93431 UPSTREAM: PCI: Store all PCIe Supported Link Speeds
| * | c0f6d9ee UPSTREAM: neighbour: add support for NUD_PERMANENT proxy entries
| * | 63aad44d UPSTREAM: io_uring: don't use int for ABI
| * | 6b2884b6 UPSTREAM: block: Make REQ_OP_ZONE_FINISH a write operation
| * | f0b4e777 UPSTREAM: sched/psi: Fix psi_seq initialization
| * | dbfc1413 UPSTREAM: sched/psi: Optimize psi_group_change() cpu_clock() usage
| * | d762e881 UPSTREAM: f2fs: fix to avoid out-of-boundary access in devs.path
| * | c852e9cb UPSTREAM: audit,module: restore audit logging in load failure case
| * | 7990a4c9 UPSTREAM: vhost: Reintroduce kthread API and add mode selection
| * | 555c2032 UPSTREAM: pps: fix poll support
| * | a6ad71b7 UPSTREAM: Bluetooth: hci_sync: fix double free in 'hci_discovery_filter_clear()'
| * | dfdd999a UPSTREAM: mm: vmalloc: only zero-init on vrealloc shrink
| * | 7eec06fc UPSTREAM: mm: vmalloc: actually use the in-place vrealloc region
| * | efba6a3d UPSTREAM: selftests/bpf: Add tests with stack ptr register in conditional jmp
| * | 311624c0 ANDROID: GKI: remove remaining entries from abi.stg.allowed_breaks
| * | 3d3df1d1 ANDROID: GKI: update the abi.stg file after abi break reverts
| * | a09eff77 ANDROID: GKI: remove ANDROID_KABI_DECLONLY from dma-buf.c
| * | 0b870ee2 Revert "ANDROID: CRC / ABI fixups for sched_dl_entity bitfield addition"
| * | 3fb73bb7 Revert "ANDROID: f2fs: fixup ABI break due to reserved_pin_section"
| * | 941e2a01 Revert "ANDROID: MODVERSIONS: hide type definition in drivers/usb/core/driver.c"
| * | a2aa6143 Revert "ANDROID: Fixup init_user_ns CRC change"
| * | b659f9f8 Merge android16-6.12 into android16-6.12-kminext
| * | 9877badb ANDROID: ANDROID: refresh ABI following addition of BACKPORT padding
| * | 33fbf477 ANDROID: PCI: Add backport reserved field to struct pci_host_bridge.
| * | 4479af54 ANDROID: abi.stg update for reverted cpufreq changes
| * | 2963ae1c Reapply "ANDROID: Revert "cpufreq: Avoid using inconsistent policy->min and policy->max""
| * | 6859e557 Revert "UPSTREAM: cpufreq: Fix setting policy limits when frequency tables are used"
| * | af535182 ANDROID: abi.stg update for scheduler changes
| * | 3313e031 BACKPORT: sched/fair: Always trigger resched at the end of a protected period
| * | 9e92c945 UPSTREAM: sched/fair: Fix entity's lag with run to parity
| * | 379d7a41 UPSTREAM: sched/fair: Limit run to parity to the min slice of enqueued entities
| * | 8726da30 BACKPORT: sched/fair: Remove spurious shorter slice preemption
| * | 993e6eda BACKPORT: sched/fair: Fix NO_RUN_TO_PARITY case
| * | 46745210 UPSTREAM: sched/fair: Use protect_slice() instead of direct comparison
| * | 379bd2f9 UPSTREAM: sched/fair: Allow decaying util_est when util_avg > CPU capa
| * | 94a86b79 BACKPORT: sched/fair: Fix EEVDF entity placement bug causing scheduling lag
| * | 39e3480a BACKPORT: sched/fair: Do not try to migrate delayed dequeue task
| * | 2455a924 ANDROID: GKI: update the abi due to reverts being re-applied
| * | 5d7729b4 UPSTREAM: selftests/bpf: extend changes_pkt_data with cases w/o subprograms
| * | c2cee2f4 UPSTREAM: bpf: fix null dereference when computing changes_pkt_data of prog w/o subprogs
| * | 79d27794 UPSTREAM: selftests/bpf: validate that tail call invalidates packet pointers
| * | 3960fe3c UPSTREAM: selftests/bpf: freplace tests for tracking of changes_packet_data
| * | fbb1a3de UPSTREAM: bpf: check changes_pkt_data property for extension programs
| * | 48be6409 UPSTREAM: selftests/bpf: test for changing packet data from global functions
| * | fc086ee8 UPSTREAM: bpf: track changes_pkt_data property for global functions
| * | ab94307a ANDROID: GKI: update the abi due to reverts being re-applied
| * | 4780cfe6 Revert "ANDROID: GKI: fix up CRC issue with struct drm_atomic_state"
| * | dd92f680 UPSTREAM: cpufreq: Fix setting policy limits when frequency tables are used
| * | c4514ee5 Revert "ANDROID: Revert "cpufreq: Avoid using inconsistent policy->min and policy->max""
| * | 22bc5499 UPSTREAM: Bluetooth: MGMT: Protect mgmt_pending list with its own lock
| * | f481a429 UPSTREAM: Bluetooth: hci_core: Fix use-after-free in vhci_flush()
| * | 3f619823 UPSTREAM: usb: typec: class: Unlocked on error in typec_register_partner()
| * | eac7385f UPSTREAM: usb: typec: class: Invalidate USB device pointers on partner unregistration
| * | fa0b851a UPSTREAM: usb: typec: class: Fix NULL pointer access
| * | 9c0e9bee ANDROID: GKI: remove users of ANDROID_KABI_ENUMERATOR_IGNORE()
| * | 52312616 ANDROID: GKI: update the abi due to reverts being re-applied
| * | d65ce03d UPSTREAM: cgroup/cpuset: Fix race between newly created partition and dying one
| * | a1f3f127 UPSTREAM: gpiolib: protect gpio_chip with SRCU in array_info paths in multi get/set
| * | 0d0c1164 UPSTREAM: scsi: smartpqi: Use is_kdump_kernel() to check for kdump
| * | acec42cf UPSTREAM: scsi: replace blk_mq_pci_map_queues with blk_mq_map_hw_queues
| * | 6a84ea41 UPSTREAM: blk-mq: introduce blk_mq_map_hw_queues
| * | ae8d120d UPSTREAM: driver core: bus: add irq_get_affinity callback to bus_type
| * | b8fa72e7 UPSTREAM: block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone
| * | 1fab9579 UPSTREAM: block: remove the ioprio field from struct request
| * | 7f82cf03 UPSTREAM: block: remove the write_hint field from struct request
| * | 0bbe377b ANDROID: GKI: update the abi due to reverts being re-applied
| * | c7464413 UPSTREAM: xsk: Fix race condition in AF_XDP generic RX path
| * | f73d0ba8 UPSTREAM: mm: vmalloc: support more granular vrealloc() sizing
| * | 426654b2 UPSTREAM: virtio_net: ensure netdev_tx_reset_queue is called on bind xsk for tx
| * | 71db1a37 UPSTREAM: virtio_ring: add a func argument 'recycle_done' to virtqueue_reset()
| * | 1474b3ee UPSTREAM: ipv6: save dontfrag in cork
| * | a6264458 UPSTREAM: genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie
| * | 03323ac5 UPSTREAM: crypto: ahash - Set default reqsize from ahash_alg
| * | 7d902a5a ANDROID: GKI: update the abi due to reverts being re-applied
| * | 28b0a080 UPSTREAM: Revert "drm/xe/forcewake: Add a helper xe_force_wake_ref_has_domain()"
| * | 31868d0c UPSTREAM: Revert "drm/xe/devcoredump: Update handling of xe_force_wake_get return"
| * | ea108ae5 UPSTREAM: Revert "drm/xe/tests/mocs: Update xe_force_wake_get() return handling"
| * | 0d987e7f UPSTREAM: Revert "drm/xe/gt: Update handling of xe_force_wake_get return"
| * | 900418c7 UPSTREAM: drm/i915/dp: Fix 2.7 Gbps DP_LINK_BW value on g4x
| * | 6f5206c5 UPSTREAM: drm/sched: Remove optimization that causes hang when killing dependent jobs
| * | 12cab0be UPSTREAM: drm/amdgpu: Reset the clear flag in buddy during resume
| * | 0b7afe9c UPSTREAM: drm/bridge: ti-sn65dsi86: Remove extra semicolon in ti_sn_bridge_probe()
| * | 834fc31a UPSTREAM: drm/xe: Move page fault init after topology init
| * | 65a705a0 UPSTREAM: drm/xe/mocs: Initialize MOCS index early
| * | 8acdbf21 UPSTREAM: drm/mediatek: only announce AFBC if really supported
| * | 5fac0324 UPSTREAM: drm/mediatek: Add wait_event_timeout when disabling plane
| * | bdc49bfa UPSTREAM: drm/xe/pf: Prepare to stop SR-IOV support prior GT reset
| * | 0321b799 UPSTREAM: drm/xe/pf: Move VFs reprovisioning to worker
| * | f38d6b51 UPSTREAM: drm/xe/pf: Sanitize VF scratch registers on FLR
| * | 2bb5411e UPSTREAM: drm/amd/display: Free memory allocation
| * | ea2f0e04 UPSTREAM: drm/amd/display: Disable CRTC degamma LUT for DCN401
| * | 6c0feb52 UPSTREAM: drm/amdgpu: Increase reset counter only on success
| * | 72768dd6 UPSTREAM: drm/amdgpu/gfx8: reset compute ring wptr on the GPU on resume
| * | bc77a6a5 UPSTREAM: drm/xe/pm: Correct comment of xe_pm_set_vram_threshold()
| * | 3ea1b64e UPSTREAM: drm/xe/pf: Clear all LMTT pages on alloc
| * | 4c72effa UPSTREAM: drm/nouveau/gsp: fix potential leak of memory used during acpi init
| * | 48df5835 UPSTREAM: drm/tegra: nvdec: Fix dma_alloc_coherent error check
| * | 4002950c UPSTREAM: drm/xe: Allocate PF queue size on pow2 boundary
| * | 7ef6dd4d UPSTREAM: drm/framebuffer: Acquire internal references on GEM handles
| * | b3edf9f2 UPSTREAM: Revert "drm/xe/xe2: Enable Indirect Ring State support for Xe2"
| * | 1234d4a2 UPSTREAM: drm/xe/bmg: fix compressed VRAM handling
| * | 95e7f561 UPSTREAM: drm/gem: Fix race in drm_gem_handle_create_tail()
| * | 303ff639 UPSTREAM: drm/ttm: fix error handling in ttm_buffer_object_transfer
| * | 2fa1d9a1 UPSTREAM: drm/gem: Acquire references on GEM handles for framebuffers
| * | daac9a7a UPSTREAM: drm/amdkfd: Don't call mmput from MMU notifier callback
| * | 46210b6b UPSTREAM: drm/imagination: Fix kernel crash when hard resetting the GPU
| * | 66c54340 UPSTREAM: drm/amdgpu: Replace Mutex with Spinlock for RLCG register access to avoid Priority Inversion in SRIOV
| * | 200925e7 UPSTREAM: drm/amdgpu/ip_discovery: add missing ip_discovery fw
| * | a39e9d47 UPSTREAM: drm/amdgpu/discovery: use specific ip_discovery.bin for legacy asics
| * | 23e4df13 UPSTREAM: drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling
| * | edd4afeb ANDROID: GKI: update the abi due to reverts being re-applied
| * | 9faae7ad UPSTREAM: net: page_pool: avoid false positive warning if NAPI was never added
| * | bbdca976 UPSTREAM: espintcp: remove encap socket caching to avoid reference leak
| * | b1cef753 UPSTREAM: perf: Avoid the read if the count is already updated
| * | 97e1cd5d UPSTREAM: coredump: hand a pidfd to the usermode coredump helper
| * | c78656bd UPSTREAM: page_pool: Track DMA-mapped pages and unmap them when destroying the pool
| * | c8648c3c UPSTREAM: dm: fix dm_blk_report_zones
| * | 503a5365 UPSTREAM: usb: xhci: Fix Short Packet handling rework ignoring errors
| * | 2f706780 UPSTREAM: xhci: Handle spurious events on Etron host isoc enpoints
| * | 07a351a1 UPSTREAM: usb: xhci: set page size to the xHCI-supported size
| * | bc68fcb2 UPSTREAM: usb: typec: ucsi: fix Clang -Wsign-conversion warning
| * | 3628d840 ANDROID: GKI: update the abi due to reverts being re-applied
| * | 3bc4115a Revert "ANDROID: GKI: fix up crc issue in crypto_get_default_null_skcipher()"
| * | d7ba660a Revert "ANDROID: GKI: fix up CRC issue with msi.c"
| * | f2280e1b ANDROID: GKI: update the abi due to reverts being re-applied
| * | 7eb48d73 UPSTREAM: PCI: endpoint: Retain fixed-size BAR size as well as aligned size
| * | d1b84a3c UPSTREAM: tcp: add receive queue awareness in tcp_rcv_space_adjust()
| * | 7d24fae1 UPSTREAM: usb: acpi: fix device link removal
| * | f567a7b9 UPSTREAM: sched/fair: Fixup wake_up_sync() vs DELAYED_DEQUEUE
| * | f223aa8e UPSTREAM: sched/fair: Add new cfs_rq.h_nr_runnable
| * | a3085715 UPSTREAM: sched/fair: Rename h_nr_running into h_nr_queued
| * | 69b39246 UPSTREAM: bpf: Do not include stack ptr register in precision backtracking bookkeeping
| * | 8b16341f UPSTREAM: bpf: use common instruction history across all states
| * | 57855236 UPSTREAM: net: vlan: fix VLAN 0 refcount imbalance of toggling filtering during runtime
| * | a5b23dda UPSTREAM: sched: Change nr_uninterruptible type to unsigned long
| * | 1cc9ef9a Merge android16-6.12 into android16-6.12-kminext
| * | deaaa491 Merge android16-6.12 into android16-6.12-kminext
|  /
* | f5932e57 ANDROID: ufs: core: Make HID attributes visible
* | 19980635 FROMGIT: scsi: ufs: core: Revert "Make HID attributes visible"
* | 647eb51c ANDROID: Add TEST_MAPPING for drm drivers
* | 786c201e ANDROID: KVM: arm64: sync_icache_alias for pKVM module symbols reloc
* | 03b8d1fc ANDROID: KVM: arm64: Fix kern to mod VA for pKVM module symbols reloc
* | 55a408fd ANDROID: KVM: arm64: Add a helper to convert kern VA into a pKVM mod VA
* | be1b44e8 ANDROID: KVM: arm64: Fix pKVM ftrace va to phys
* | 57068bb5 BACKPORT: FROMGIT: KVM: arm64: Bump the supported version of FF-A to 1.2
* | b01a8b01 ANDROID: KVM: arm64: Fix return code for guest FF-A version
* | 2c3491f8 ANDROID: KVM: arm64: Retry guest ff-a sharing with the faulted pages
|/
* 3a98cc3b ANDROID: GKI: Update symbol list for qcom
* 87b5e9fc ANDROID: Export __sched_proxy_exec symbol
* a1f03e11 ANDROID: gki_defconfig: Enable CONFIG_GACT_PROB
* c13a9f71 UPSTREAM: drm/panel-edp: Add B140UAN04.4 and MNE007QS3-7
* 57055bed ANDROID: GKI: Export __printk_deferred_{enter,exit}()
* 5a1651a4 ANDROID: sched: Fix SCHED_WARN_ON()
* 30269ceb BACKPORT: erofs: support to readahead dirent blocks in erofs_readdir()
* 74a46084 BACKPORT: f2fs: fix to mitigate overhead of f2fs_zero_post_eof_page()
* fc2f50b6 BACKPORT: f2fs: fix UAF issue in f2fs_merge_page_bio()
* 44a428f1 ANDROID: SPED: Add symbols for vendor hook
* da5fbaa2 ANDROID: SPED: Add vendor hooks in Scheduler
* 315d114c UPSTREAM: xhci: dbc: enable back DbC in resume if it was enabled before suspend
* 8bbbd204 UPSTREAM: xhci: dbc: fix bogus 1024 byte prefix if ttyDBC read races with stall event
* 339c2a0a ANDROID: microdroid_defconfig: add arm64.nompam to CONFIG_CMDLINE
* 9e32f3af Revert "ANDROID: sched: Add vendor hooks for override sugov behavior"
* ec806d3e BACKPORT: f2fs: fix to avoid migrating empty section
* 04de3b7a ANDROID: GKI: add symbol list for rockchip
* 2c72eb71 ANDROID: KVM: arm64: show the name of non page-aligned device nodes
* a6909a34 ANDROID: KVM: arm64: Don't use a smaller FF-A version than the hyp
* d4564b29 BACKPORT: FROMGIT: memfd,selinux: call security_inode_init_security_anon()
* 76ff62b7 ANDROID: GKI: add symbol list for telechips

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