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

Merge branch 'android13-5.15' into branch 'android13-5.15-lts'



Catch the LTS branch up with the changed done on the normal one.  This
includes a number of abi updates.  Included in here are the following
commits:

* 9ef28a4a ANDROID: ABI: Update oplus symbol list
* 4ba622c8 BACKPORT: dm-crypt: Fix IO priority lost when queuing write bios
* 21bc63de BACKPORT: dm-verity: Fix IO priority lost when reading FEC and hash
* a6ac2684 BACKPORT: dm-bufio: Support IO priority
* 105ddd31 BACKPORT: dm-io: Support IO priority
* 145f5ae7 BACKPORT: block: Fix where bio IO priority gets set
* d2356f0a UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
* 677308ef BACKPORT: xhci: track port suspend state correctly in unsuccessful resume cases
* 54c78a97 BACKPORT: usb: host: xhci: Avoid XHCI resume delay if SSUSB device is not present
* 296c8dcf BACKPORT: mm: update mark_victim tracepoints fields
* a103ad75 Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"
* 2e1b2c25 UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path
* 136c89d0 ANDROID: GKI: Update symbol list for Amlogic
* 6d5bd08e ANDROID: Update abi_gki_aarch64_qcom symbol
* a14a7d16 UPSTREAM: ARM: 9269/1: vfp: Add hwcap for FEAT_DotProd
* 91ca2bfa UPSTREAM: ARM: 9268/1: vfp: Add hwcap FPHP and ASIMDHP for FEAT_FP16
* 768ae8ad UPSTREAM: ARM: 9267/1: Define Armv8 registers in AArch32 state
* d76a750f FROMLIST: binder: check offset alignment in binder_get_object()
* afb3d041 ANDROID: Update abi_gki_aarch64_qcom for fw_devlink_purge_absent_suppliers
* 79167160 Merge tag 'android13-5.15.148_r00' into android13-5.15
* c68af5a4 UPSTREAM: usb: dwc3: gadget: Don't disconnect if not started
* 192ec99b ANDROID: Update the GKI symbol list and ABI XML
* 455774fb UPSTREAM: netfilter: nf_tables: disallow timeout for anonymous sets
* 876d0386 ANDROID: userfaultfd: abort uffdio ops if mmap_lock is contended
* ba6ef9bd ANDROID: userfaultfd: add MMAP_TRYLOCK mode for COPY/ZEROPAGE
* 77741f2a FROMGIT: usb: host: xhci-plat: Set XHCI_STATE_REMOVING before resuming XHCI HC
* 3dad6bbb FROMGIT: usb: host: xhci: Do not re-initialize the XHCI HC if being removed
* fd6ffbfe ANDROID: uid_sys_stat: fix data-error of cputime and io
* ae4e545e ANDROID: fix isolate_migratepages_range return value
* 0daa9d94 ANDROID: GKI: Update oplus symbol list
* 796c7df4 ANDROID: update symbol for unisoc whitelist
* ca5564fc ANDROID: TRACE: mm: export mm_filemap_* for calling in ko
* 642839b4 ANDROID: abi_gki_aarch64_qcom: Export trace_android_vh_try_fixup_sea
* 4b37cfc4 ANDROID: arm64: Call fixup_exception() within do_sea()
* c1b66b52 ANDROID: ABI: Add avenrun symbol to symbol list for unisoc
* 4782f1c2 FROMGIT: usb: xhci: Add error handling in xhci_map_urb_for_dma
* 9b613572 ANDROID: userfaultfd: allow SPF for UFFD_FEATURE_SIGBUS on private+anon
* a2e42c95 UPSTREAM: usb: dwc3: gadget: Handle EP0 request dequeuing properly
* 611a5f3b BACKPORT: hwrng: virtio - unregister device before reset
* 8ec555a9 Revert "interconnect: Fix locking for runpm vs reclaim"
* 27d93dc9 UPSTREAM: virtio-rng: make device ready before making request
* 0ac651d0 Revert "interconnect: Teach lockdep about icc_bw_lock order"
* 3389e4de ANDROID: ABI: Update oplus symbol list
* bb86b9f4 ANDROID: binder: Add vendor hook to fix priority restore
* 701ed3a6 UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc
* 12c909f7 BACKPORT: FROMGIT: PM: runtime: add tracepoint for runtime_status changes
* 68136390 BACKPORT: UPSTREAM: tick/sched: Preserve number of idle sleeps across CPU hotplug events
* 9393aa38 BACKPORT: UPSTREAM: tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug
* 22789c4d ANDROID: GKI: Add symbol list for Nothing
* 490fc49c ANDROID: thermal: Add vendor thermal_pm_notify_suspend function
* 34d2057e ANDROID: ABI: Update oplus symbol list
* 5b6eaab5 ANDROID: GKI: add more vfs-only exports to their own namespace
* 2bbf68d8 ANDROID: fs: Export free_fs_struct,copy_fs_struct.

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