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

Merge branch 'android12-5.10' into branch 'android12-5.10-lts'



Bring the LTS branch up to sync with the non-LTS branch.  This contains
the following commits:

* 36e3dade FROMLIST: binder: check offset alignment in binder_get_object()
* 750e8cd3 ANDROID: enable CONFIG_USB_XHCI_PCI_RENESAS in gki_defconfig
* 17d32425 Merge tag 'android12-5.10.209_r00' into android12-5.10
* 42ae2a9c UPSTREAM: usb: dwc3: core: set force_gen1 bit in USB31 devices if max speed is SS
* a0b6273e ANDROID: userfaultfd: abort uffdio ops if mmap_lock is contended
* e3aabbf8 ANDROID: userfaultfd: add MMAP_TRYLOCK mode for COPY/ZEROPAGE
* 0ebc4699 UPSTREAM: coresight: etm4x: Remove bogous __exit annotation for some functions
* 40173a14 UPSTREAM: ASoC: hdmi-codec: register hpd callback on component probe
* 438106d0 UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
* 49552987 UPSTREAM: mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
* 5d0d2934 UPSTREAM: task_work: add kerneldoc annotation for 'data' argument
* b4c0e451 UPSTREAM: x86/purgatory: Remove LTO flags
* 78254cf9 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
* f91d081f UPSTREAM: block/mq-deadline: use correct way to throttling write requests
* d60601c3 UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
* ce364c0d UPSTREAM: clk: Fix memory leak in devm_clk_notifier_register()
* eebfedfd UPSTREAM: selftests: damon: add config file
* d93f7952 ANDROID: abi_gki_aarch64_qcom: Export trace_android_vh_try_fixup_sea
* f211036c ANDROID: arm64: Call fixup_exception() within do_sea()
* a905086c ANDROID: userfaultfd: allow SPF for UFFD_FEATURE_SIGBUS on private+anon
* 91714391 UPSTREAM: usb: dwc3: gadget: Handle EP0 request dequeuing properly
* 5e21de09 UPSTREAM: usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API
* f6c4f779 ANDROID: GKI: Update symbols to symbol list
* 94b9d8e5 ANDROID: add hooks into blk-mq-sched.c for customized I/O scheduler
* 6912e0c8 ANDROID: add hooks into blk-ma-tag.c for customized I/O scheduler
* f76294a6 ANDROID: add hooks into blk-flush.c for customized I/O scheduler
* d2699923 ANDROID: add hooks into blk-core.c for customized I/O scheduler
* ccbc7f88 ANDROID: add hooks into blk-mq.c for customized I/O scheduler.
* 34338029 ANDROID: add hooks into bio.c for customized I/O scheduler
* b2e58fe5 ANDROID: ABI: Update oplus symbol list
* 517fdcc1 ANDROID: binder: Add vendor hook to fix priority restore
* 0b886c60 ANDROID: GKI: Update symbol list
* ca7dabaf ANDROID: Add vendor hook for task exiting routine
* 0415c5cc UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc
* 92d263f2 ANDROID: GKI: Update oplus symbol list
* 2a717853 UPSTREAM: usb: gadget: uvc: set v4l2_dev->dev in f_uvc
* 44817294 ANDROID: mm: Fix VMA ref count after fast-mremap

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