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

Merge branch 'android14-6.1' into android14-6.1-lts



This catches the -lts branch up with a lot of abi updates and resolves a
merge conflict in f2fs.  Changes in here include:

* 976b0557 UPSTREAM: HID: Use kvzalloc instead of kzalloc in hid_register_field()
* fadb08b3 FROMGIT: xhci: Fix Link TRB DMA in command ring stopped completion event
* 19b68814 Merge tag 'android14-6.1.112_r00' into android14-6.1
* 29d66b39 UPSTREAM: exit: Sleep at TASK_IDLE when waiting for application core dump
* 179ccc93 UPSTREAM: spi: spi-geni-qcom: Rename the label unmap_if_dma
* 9a072aa7 UPSTREAM: spi: spi-geni-qcom: Add SPI Device mode support for GENI based QuPv3
* 759bab94 ANDROID: GKI: update symbol list for honor
* f949397a ANDROID: GKI: net: add vendor hooks for link data path
* 3165cd11 ANDROID: ABI: Update symbol list for spi-geni-qcom updates
* 3b727b01 UPSTREAM: spi: spi-geni-qcom: Do not do DMA map/unmap inside driver, use framework instead
* a874ed06 UPSTREAM: Revert "tty: serial: simplify qcom_geni_serial_send_chunk_fifo()"
* e9c03c47 UPSTREAM: serial: qcom-geni: Don't cancel/abort if we can't get the port lock
* 2c16ff38 UPSTREAM: serial: qcom_geni: Convert to platform remove callback returning void
* 7161dbc3 UPSTREAM: serial: qcom-geni: Use port lock wrappers
* cd5bd514 UPSTREAM: tty: serial: qcom-geni-serial: Poll primary sequencer irq status after cancel_tx
* 5722a4dd UPSTREAM: serial: qcom-geni: clean up clock-rate debug printk
* d5e0fbcd UPSTREAM: serial: qcom-geni: use icc tag defines
* 5bdef281 ANDROID: ABI: update gki symbol list
* a03d1670 ANDROID: Add vendor hook for cma adjusting
* e02772c7 BACKPORT: firmware: arm_scmi: Queue in scmi layer for mailbox implementation
* 4dc24985 UPSTREAM: tty: serial: simplify qcom_geni_serial_send_chunk_fifo()
* 719b876f UPSTREAM: tty: serial: qcom-geni-serial: Add a poll_init() function
* d15f99d2 UPSTREAM: serial: qcom-geni: drop bogus uart_write_wakeup()
* 3991e7fc UPSTREAM: serial: qcom-geni: fix mapping of empty DMA buffer
* 64bccf31 UPSTREAM: serial: qcom-geni: fix DMA mapping leak on shutdown
* 4c3917c6 UPSTREAM: serial: qcom-geni: fix console shutdown hang
* 8bbc5694 UPSTREAM: serial: qcom_geni: Fix variable naming
* 53be6ca1 BACKPORT: tty: serial: qcom-geni-serial: add support for serial engine DMA
* 3321cd20 BACKPORT: soc: qcom-geni-se: add more symbol definitions
* 61df751a BACKPORT: tty: serial: qcom-geni-serial: use of_device_id data
* 3ebd383e BACKPORT: tty: serial: qcom-geni-serial: drop the return value from handle_rx
* a88673be UPSTREAM: tty: serial: qcom-geni-serial: refactor qcom_geni_serial_send_chunk_fifo()
* 94076b81 UPSTREAM: soc: qcom: geni-se: add GP_LENGTH/IRQ_EN_SET/IRQ_EN_CLEAR registers
* a137aa79 UPSTREAM: soc: qcom: geni-se: Add M_TX_FIFO_NOT_EMPTY bit definition
* 1790581f FROMLIST: ufs: core: requeue aborted request
* 51903b71 FROMLIST: ufs: core: fix the issue of ICU failure
* 00f19bd9 ANDROID: GKI: Add symbol for rockchip pci remove
* 5e1f4bb1 ANDROID: abi_gki_aarch64_qcom: Add pci_ecam_map_bus and pci_host_common_probe
* 72f51dd6 ANDROID: abi_gki_aarch64_honor: whitelist symbols added for skip memcg reclaim by priority
* f2b3f588 ANDROID: mm: add vendor hook to skip memcg reclaim by priority
* add3d686 ANDROID: KVM: arm64: Don't run a protected VCPU if it isn't runnable
* 1fe91f86 ANDROID: usb: Optimization the transfer rate of accessory mode in USB3.2 mode
* 299cc919 UPSTREAM: spi: spi-geni-qcom: Select FIFO mode for chip select
* b490c667 ANDROID: KVM: arm64: Don't skip accounting when memcache top-up fails
* 11815018 ANDROID: KVM: arm64: Fix accounting when VM creation fails
* 8baadbac UPSTREAM: spi: geni-qcom: Convert to platform remove callback returning void
* 5ab05b86 UPSTREAM: spi: spi-geni-qcom: Add support for SE DMA mode
* 271bd223 UPSTREAM: soc: qcom: geni-se: Add SPI Device mode support for GENI based QuPv3
* 27021bed UPSTREAM: tty: serial: qcom-geni-serial: split out the FIFO tx code
* ad717604 UPSTREAM: tty: serial: qcom-geni-serial: remove unneeded tabs
* ad376325 UPSTREAM: tty: serial: qcom-geni-serial: refactor qcom_geni_serial_isr()
* 1f077535 UPSTREAM: tty: serial: qcom-geni-serial: remove stray newlines
* 59cbbd0b UPSTREAM: tty: serial: qcom-geni-serial: improve the to_dev_port() macro
* f4eec633 UPSTREAM: tty: serial: qcom-geni-serial: align #define values
* b92a6c85 UPSTREAM: tty: serial: qcom-geni-serial: remove unused symbols
* 6e6cda8f UPSTREAM: tty: serial: qcom-geni-serial: drop unneeded forward definitions
* d75a5076 UPSTREAM: tty: serial: qcom-geni-serial: stop operations in progress at shutdown
* 481220c5 ANDROID: abi_gki_aarch64_qcom: whitelist mm symbols
* e697302b ANDROID: mm: export lru_gen_caps
* 1a3bbc19 ANDROID: mm: export unpack_shadow
* a6266110 UPSTREAM: i2c: qcom-geni: Use IRQF_NO_AUTOEN flag in request_irq()
* c24feb93 UPSTREAM: i2c: qcom-geni: Use goto for clearer exit path
* 80c036f7 UPSTREAM: i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume
* 688cbb4c UPSTREAM: i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume
* aff2261b UPSTREAM: i2c: qcom-geni: Add missing clk_disable_unprepare in geni_i2c_runtime_resume
* 371a327f UPSTREAM: i2c: qcom-geni: use 'time_left' variable with wait_for_completion_timeout()
* c756c6b0 UPSTREAM: i2c: qcom-geni: remove printout on handled timeouts
* fa329140 UPSTREAM: i2c: qcom-geni: fix missing clk_disable_unprepare() and geni_se_resources_off()
* 8fd3f078 UPSTREAM: i2c: qcom-geni: Convert to devm_platform_ioremap_resource()
* 02b20eb4 UPSTREAM: i2c: Convert to platform remove callback returning void
* a650b9fb UPSTREAM: i2c: qcom-geni: change i2c_master_hub to static
* aa4151b8 UPSTREAM: i2c: qcom-geni: add support for I2C Master Hub variant
* 47d1f8ed UPSTREAM: i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant
* 752034bc UPSTREAM: wifi: cfg80211: fix reporting failed MLO links status with cfg80211_connect_done
* 40c204b0 UPSTREAM: scsi: ufs: core: Do not set link to OFF state while waking up from hibernation
* 2589c7fa UPSTREAM: mm/mglru: fix overshooting shrinker memory
* 4d8187d2 UPSTREAM: gso: fix udp gso fraglist segmentation after pull from frag_list
* b11f74b6 UPSTREAM: soc: qcom: geni-se: Do not bother about enable/disable of interrupts in secondary sequencer
* f9d2a8a3 UPSTREAM: soc: qcom: geni-se: Add interfaces geni_se_tx_init_dma() and geni_se_rx_init_dma()
* 8097478a UPSTREAM: unicode: Don't special case ignorable code points
* d41d398d BACKPORT: f2fs: fix to handle segment allocation failure correctly
* 751a02f7 UPSTREAM: f2fs: stop checkpoint when get a out-of-bounds segment
* acc7335e BACKPORT: f2fs: kill heap-based allocation
* 19e119d2 Reapply "io_uring: drop any code related to SCM_RIGHTS"
* 80e851bf FROMGIT: scsi: ufs: core: Support Updating UIC Command Timeout
* 0d60f50b ANDROID: GKI: Update symbol list for mtk
* 0ff444ed UPSTREAM: Revert "usb: typec: tcpm: clear pd_event queue in PORT_RESET"
* 311457e8 ANDROID: GKI: update symbol list for transsion
* 8d298374 UPSTREAM: firmware_loader: Abort all upcoming firmware load request once reboot triggered
* a9d791a2 UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()
* 0e8b65e4 ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE
* d4dab27b UPSTREAM: f2fs: fix to update i_ctime in __f2fs_setxattr()
* d645f73d UPSTREAM: f2fs: atomic: fix to truncate pagecache before on-disk metadata truncation
* 693980c2 BACKPORT: f2fs: Create COW inode from parent dentry for atomic write
* e35539a5 BACKPORT: f2fs: atomic: fix to avoid racing w/ GC
* 9de4353c UPSTREAM: f2fs: use meta inode for GC of COW file
* 9b5ee2f2 BACKPORT: f2fs: use meta inode for GC of atomic file
* 30f8a76d ANDROID: abi_gki_aarch64_qcom: Add missing symbol to QCOM list
* 6f2e0215 ANDROID: GKI: Add KMI symbols for virtio-audio
* ba06e1f1 ANDROID: fix up ABI with change to private struct geni_wrapper
* e0de5c9e UPSTREAM: soc: qcom: geni-se: add desc struct to specify clocks from device match data
* 1cdc168f ANDROID: GKI: Update symbol list for mtk
* 7c49c3ac UPSTREAM: arm64: cputype: Add Neoverse-V3 definitions
* 53769a60 UPSTREAM: arm64: cputype: Add Cortex-X4 definitions
* ecc82c7e UPSTREAM: arm64: barrier: Restore spec_bar() macro
* bd3cc5c7 UPSTREAM: KVM: arm64: Add memory length checks and remove inline in do_ffa_mem_xfer
* a43e7c2c ANDROID: GKI: Update symbol list for BCMSTB
* 5162f9a6 UPSTREAM: arm64: Add Neoverse-V2 part
* 11059541 UPSTREAM: usb: dwc3: core: update LC timer as per USB Spec V3.2
* cc274231 ANDROID: GKI: Add symbol for pci power limit

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