Commit c0dac9c7 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:

* ce2b36d4 Merge tag 'android15-6.6.111_r00' into android15-6.6
* bf3f5d88 BACKPORT: f2fs: fix to avoid migrating empty section
* e1067e35 ANDROID: GKI: Update symbol list for vivo
* 3adae2c5 ANDROID: vendor_hooks: add hook in __dev_pm_qos_update_request()
* 46cba283 Revert "ANDROID: add .bazelignore file"
* cf7e6e9e UPSTREAM: Revert "cpuidle: menu: Avoid discarding useful information"
* c2a233de BACKPORT: net: Add locking to protect skb->dev access in ip_output
* 41bb88ad UPSTREAM: net: dst: add four helpers to annotate data-races around dst->dev
* c88d5c40 UPSTREAM: arm64: insn: Simulate nop instruction for better uprobe performance
* ae58cf0f UPSTREAM: f2fs: fix wrong block mapping for multi-devices
* 68db1ce2 ANDROID: abi_gki_aarch64_fips140: add more symbols
* fadca08a UPSTREAM: crypto: jitter - Mark intermediary memory as clean
* ac3e5b49 UPSTREAM: crypto: jitter - fix intermediary handling
* b510ecc6 UPSTREAM: crypto: jitter - output full sample from test interface
* a8a56d2e UPSTREAM: crypto: jitter - use permanent health test storage
* ede62837 UPSTREAM: crypto: jitter - reuse allocated entropy collector
* 453a05ed UPSTREAM: crypto: jitter - set default OSR to 3
* bd9b4abe UPSTREAM: crypto: jitterentropy - Hide esoteric Kconfig options under FIPS and EXPERT
* 01ea8d01 UPSTREAM: crypto: jitter - Allow configuration of oversampling rate
* d250e78c UPSTREAM: crypto: jitter - Allow configuration of memory size
* 51c6e3f7 UPSTREAM: crypto: jitter - add RCT/APT support for different OSRs
* 6c8b014d FROMGIT: f2fs: set default valid_thresh_ratio to 80 for zoned devices
* d26012b0 BACKPORT: FROMGIT: f2fs: maintain one time GC mode is enabled during whole zoned GC cycle
* ec71ebf8 ANDROID: PM: Fix suspend spinlock in IRQ context
* a54fd3a7 UPSTREAM: crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
* af29a281 ANDROID: GKI: update symbol list file for xiaomi
* 88c9cda3 ANDROID: vendor_hooks: Add alloc_factor to pcp allocation and release
* af83c2ce ANDROID: abi_gki_aarch64_qcom: Add device_node_to_regmap API
* 0c31fd1b UPSTREAM: scsi: ufs: core: Disable timestamp functionality if not supported
* 45af5787 Revert "ANDROID: sched: Add vendor hooks for override sugov behavior"
* ef7a79a8 UPSTREAM: mm/oom_kill: the OOM reaper traverses the VMA maple tree in reverse order
* 24f6c7aa UPSTREAM: mm/oom_kill: thaw the entire OOM victim process
* f830bc35 Revert "ANDROID: Sched: Add vendor hooks in scheduler"
* ce2deb6a Revert "ANDROID: gic: Add affinity-setting vendor hooks to gic"
* b9951139 Revert "ANDROID: gic: Add affinity-setting vendor hooks to gic-v3"
* b61e75ed Revert "ANDROID: mm/cma: add vendor_hook in cma_alloc to record information"
* 175ff843 Revert "ANDROID: vendor_hooks: add vendor hooks for bio_add_page_merge_bypass"
* 57ad6ae5 UPSTREAM: mm: list_lru: disable memcg_aware when cgroup.memory is set to "nokmem"
* c4bcbf92 UPSTREAM: tls: make sure to abort the stream if headers are bogus
* db1a0aa3 ANDROID: GKI: fix ABI change in "bpf: Fix helper writes to read-only map"
* cea14524 UPSTREAM: bpf: Fix helper writes to read-only maps
* f39eae21 ANDROID: vendor hooks: fix build issue with f2fs down read
* f11e4288 UPSTREAM: usb: typec: altmodes/displayport: add irq_hpd to sysfs
* 1de7db8d ANDROID: ABI: Update oplus symbol list
* d6a44911 UPSTREAM: f2fs: add missing dput() when printing the donation list
* c0dc97ca BACKPORT: vsock/virtio: Fix message iterator handling on transmit path
* c00259fd BACKPORT: net: Introduce skb_copy_datagram_from_iter_full()
* 565afd19 FROMLIST: KVM: arm64: Fix softirq masking in FPSIMD register saving sequence
* 6bef2c60 ANDROID: KVM: Expose min hyp s1 free pages in debugfs
* 99d7e925 ANDROID: KVM: arm64: Expose hyp s1 pool stats in debugfs
* 380bd9f7 ANDROID: GKI: Add symbol to symbol list for imx
* e164c264 BACKPORT: io_uring: enable toggle of iowait usage when waiting on CQEs
* e4777dcd Revert "usb: gadget: f_ncm: Always set current gadget in ncm_bind()"
* 7a0208b6 ANDROID: ABI: Update pixel symbol list
* 048aebb8 ANDROID: KVM: arm64: Prevent memory sharing outside of the RAM regions

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