* refs/heads/tmp-8823053:
Revert "Merge remote-tracking branch into HEAD"
UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
UPSTREAM: xfs: verify buffer contents when we skip log replay
UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
FROMLIST: maple_tree: Adjust node allocation on mas_rebalance()
FROMLIST: maple_tree: Reduce resets during store setup
FROMLIST: BACKPORT: maple_tree: Refine mas_preallocate() node calculations
Revert "FROMLIST: BACKPORT: maple_tree: Refine mas_preallocate() node calculations"
ANDROID: GKI: Include kheaders in gki_system_dlkm_modules
ANDROID: 6/16/2023 KMI update
ANDROID: sched: Add parameter to android_rvh_schedule.
ANDROID: GKI: provide more padding for struct usb_phy
ANDROID: GKI enable CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
FROMGIT: arm64: set __exception_irq_entry with __irq_entry as a default
ANDROID: GKI: update symbol list file for xiaomi
ANDROID: Remove all but top-level OWNERS
ANDROID: Enable GKI Dr. No Enforcement
ANDROID: 6/16/2023 KMI update
ANDROID: virt: gunyah: Sync with latest platform ops
FROMGIT: usb: gadget: udc: core: Prevent soft_connect_store() race
FROMGIT: usb: gadget: udc: core: Offload usb_udc_vbus_handler processing
UPSTREAM: Bluetooth: fix debugfs registration
UPSTREAM: Bluetooth: hci_sync: add lock to protect HCI_UNREGISTER
UPSTREAM: net/ipv6: fix bool/int mismatch for skip_notify_on_dev_down
UPSTREAM: neighbour: fix unaligned access to pneigh_entry
UPSTREAM: tcp: deny tcp_disconnect() when threads are waiting
ANDROID: sound: usb: Add vendor's hooking interface
ANDROID: GKI: USB: XHCI: add Android ABI padding to struct xhci_driver_overrides
ANDROID: usb: host: add address_device to xhci overrides
UPSTREAM: bpf, sockmap: Avoid potential NULL dereference in sk_psock_verdict_data_ready()
UPSTREAM: bpf, sockmap: Incorrectly handling copied_seq
UPSTREAM: bpf, sockmap: Wake up polling after data copy
UPSTREAM: bpf, sockmap: TCP data stall on recv before accept
UPSTREAM: bpf, sockmap: Handle fin correctly
UPSTREAM: bpf, sockmap: Improved check for empty queue
UPSTREAM: bpf, sockmap: Reschedule is now done through backlog
UPSTREAM: bpf, sockmap: Convert schedule_work into delayed_work
UPSTREAM: bpf, sockmap: Pass skb ownership through read_skb
Revert "ANDROID: virt: gunyah: Delta between v13 and v14"
ANDROID: virt: gunyah: Sync with latest Gunyah patches
ANDROID: virt: gunyah: Sync with latest documentation and sample
FROMLIST: usb: xhci-plat: add xhci_plat_priv_overwrite
ANDROID: usb: host: export symbols for xhci hooks usage
ANDROID: usb: host: add xhci hooks for USB offload
ANDROID: 6/16/2023 KMI update
UPSTREAM: binder: fix UAF of alloc->vma in race with munmap()
UPSTREAM: binder: add lockless binder_alloc_(set|get)_vma()
UPSTREAM: Revert "android: binder: stop saving a pointer to the VMA"
UPSTREAM: Revert "binder_alloc: add missing mmap_lock calls when using the VMA"
UPSTREAM: tipc: check the bearer min mtu properly when setting it by netlink
UPSTREAM: tipc: do not update mtu if msg_max is too small in mtu negotiation
UPSTREAM: tipc: add tipc_bearer_min_mtu to calculate min mtu
UPSTREAM: Revert "usb: gadget: udc: core: Invoke usb_gadget_connect only when started"
UPSTREAM: ASoC: fsl_micfil: Fix error handler with pm_runtime_enable
UPSTREAM: platform: Provide a remove callback that returns no value
UPSTREAM: firmware: arm_sdei: Fix sleep from invalid context BUG
UPSTREAM: uapi/linux/const.h: prefer ISO-friendly __typeof__
UPSTREAM: posix-cpu-timers: Implement the missing timer_wait_running callback
ANDROID: GKI: reserve extra arm64 cpucaps for ABI preservation
ANDROID: arm64: errata: Add WORKAROUND_NXP_ERR050104 cpucaps
ANDROID: KVM: arm64: Allow setting {P,U}XN in stage-2 PTEs
ANDROID: KVM: arm64: Restrict host-to-hyp MMIO donations
ANDROID: KVM: arm64: Allow state changes of MMIO pages
ANDROID: KVM: arm64: Allow MMIO perm changes from modules
ANDROID: KVM: arm64: Don't allocate from handle_host_mem_abort
ANDROID: KVM: arm64: Donate IOMMU regions to pKVM
ANDROID: KVM: arm64: Map MMIO donation as device at EL2
ANDROID: KVM: arm64: Don't recycle pages from host mem abort
ANDROID: KVM: arm64: Pin host stage-2 tables
ANDROID: KVM: arm64: Move kvm_pte_follow() to header
ANDROID: KVM: arm64: Pre-populate host stage2
ANDROID: KVM: arm64: Fix the host ownership later
ANDROID: KVM: arm64: Don't recycle non-default PTEs
ANDROID: KVM: arm64: Introduce kvm_pgtable_stage2_reclaim_leaves
ANDROID: GKI: enable CONFIG_BLK_CGROUP_IOCOST
BACKPORT: FROMGIT: usb: core: add sysfs entry for usb device state
ANDROID: GKI: Update symbols to symbol list
ANDROID: HID; Over-ride default maximum buffer size when using UHID
UPSTREAM: maple_tree: make maple state reusable after mas_empty_area()
Revert "Revert "mm/mmap: regression fix for unmapped_area{_topdown}""
FROMLIST: scsi: ufs: ufs-mediatek: Set UFSHCD_QUIRK_MCQ_BROKEN_RTC quirk
FROMLIST: scsi: ufs: ufs-mediatek: Set UFSHCD_QUIRK_MCQ_BROKEN_INTR quirk
FROMLIST: scsi: ufs: core: Add host quirk UFSHCD_QUIRK_MCQ_BROKEN_RTC
FROMLIST: scsi: ufs: core: Add host quirk UFSHCD_QUIRK_MCQ_BROKEN_INTR
ANDROID: GKI: Add symbols and update symbol list for Unisoc
UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
ANDROID: dma-buf: support users to change dma_buf.name
ANDROID: set CONFIG_IKHEADERS=m for gki_defconfig.
ANDROID: mm: Avoid merging cma with others
ANDROID: cpufreq: times: record fast switch frequency transitions
ANDROID: fix kernelci build failure in vmscan.c
ANDROID: ABI: Update symbol list for Exynos SoC
ANDROID: gki_defconfig: enable NVME
ANDROID: ABI: Update symbols to unisoc whitelist for the scheduler
UPSTREAM: usb: gadget: uvc: queue empty isoc requests if no video buffer is available
ANDROID: GKI: Update symbol list for xiaomi
ANDROID: vendor_hooks:vendor hook for madvise_cold_or_pageout_pte_range.
ANDROID: ABI: Update pixel symbol list
ANDROID: KVM: arm64: iommu: Erase pvmfw from EL1 if possible
ANDROID: ABI: Update oplus symbol list
ANDROID: Allow vendor module to reclaim a memcg
ANDROID: Export memcg functions to allow module to add new files
ANDROID: vendor_hooks: add hooks in mem_cgroup subsystem
ANDROID: GKI: Update symbols to symbol list
ANDROID: block: export tracepoints
ANDROID: vendor_hook: Avoid clearing protect-flag before waking waiters
ANDROID: KVM: arm64: Deprecate late pKVM module loading
ANDROID: ABI: Update symbol for Exynos SoC
ANDROID: 6/7/2023 KMI update
ANDROID: db845c: Update symbol list
FROMLIST: ufs: core: Add error handling for MCQ mode
FROMLIST: ufs: mcq: Use ufshcd_mcq_poll_cqe_lock() in mcq mode
FROMLIST: ufs: mcq: Added ufshcd_mcq_abort()
FROMLIST: ufs: mcq: Add support for clean up mcq resources
FROMLIST: ufs: mcq: Add supporting functions for mcq abort
FROMLIST: ufs: core: Update the ufshcd_clear_cmds() functionality
FROMLIST: ufs: core: Combine 32-bit command_desc_base_addr_lo/hi
ANDROID: GKI: Add OEM data to mutex/rwsem
BACKPORT: mm: Multi-gen LRU: remove wait_event_killable()
FROMGIT: Binder: Add async from to transaction record
BACKPORT: FROMGIT: Binder: Add timestamp to transaction record
ANDROID: GKI: add ANDROID_OEM_DATA() in struct request_queue
ANDROID: GKI: Add ANDROID_OEM_DATA() in struct ufs_hba
ANDROID: GKI: add ANDROID_OEM_DATA in struct bio
ANDROID: GKI: Add ANDROID_OEM_DATA() in struct queue_limits
ANDROID: GKI: Add ANDROID_OEM_DATA in struct ufs_dev_info
ANDROID: sched: Add oem data in struct rq
ANDROID: nl80211: reserve UAPI attributes to support backporting after KMI freeze
ANDROID: GKI: mm: Add Android ABI padding to MGLRU structures
ANDROID: abi_gki_aarch64_qcom: Add secure hibernation APIs
ANDROID: abi_gki_aarch64_qcom: Add hibernation APIs
ANDROID: vendor hooks: Encrypt snapshot for bootloader based hibernation
UPSTREAM: tty: serial: qcom-geni-serial: Add support for Hibernation feature
ANDROID: abi_gki_aarch64_qcom: Add clk_restore_context and clk_save_context
ANDROID: vendor hooks: Add hooks to support bootloader based hibernation
ANDROID: gki_defconfig: Enable CONFIG_HIBERNATION flag
ANDROID: vendor hooks: Export symbols for bootloader based hibernation
ANDROID: gki_defconfig: enable CONFIG_LED_TRIGGER_PHY
ANDROID: add vendor fields to swap_info_struct to record swap stats
ANDROID: add vendor fields to swap_slots_cache to support multiple swap devices
ANDROID: add vendor fields to lruvec to record refault stats
ANDROID: vendor_hooks: add a field in mem_cgroup
ANDROID: vendor_hooks: add a field in pglist_data
ANDROID: GKI: Update db845c symbol list for down_write
ANDROID: fix atomisp driver missing in 6.4 kernel
BACKPORT: mm: do not increment pgfault stats when page fault handler retries
ANDROID: GKI: enable per-vma lock stats
UPSTREAM: mm: change per-VMA lock statistics to be disabled by default
UPSTREAM: s390/mm: try VMA lock-based page fault handling first
UPSTREAM: mm: separate vma->lock from vm_area_struct
UPSTREAM: mm/mmap: free vm_area_struct without call_rcu in exit_mmap
UPSTREAM: powerc/mm: try VMA lock-based page fault handling first
UPSTREAM: arm64/mm: try VMA lock-based page fault handling first
UPSTREAM: x86/mm: try VMA lock-based page fault handling first
UPSTREAM: mm: introduce per-VMA lock statistics
UPSTREAM: mm: prevent userfaults to be handled under per-vma lock
UPSTREAM: mm: prevent do_swap_page from handling page faults under VMA lock
UPSTREAM: mm: add FAULT_FLAG_VMA_LOCK flag
UPSTREAM: mm: fall back to mmap_lock if vma->anon_vma is not yet set
UPSTREAM: mm: introduce lock_vma_under_rcu to be used from arch-specific code
BACKPORT: mm: introduce vma detached flag
UPSTREAM: mm/mmap: prevent pagefault handler from racing with mmu_notifier registration
UPSTREAM: kernel/fork: assert no VMA readers during its destruction
UPSTREAM: mm: conditionally write-lock VMA in free_pgtables
UPSTREAM: mm: write-lock VMAs before removing them from VMA tree
UPSTREAM: mm/mremap: write-lock VMA while remapping it to a new address range
FROMLIST: mm/mmap: write-lock VMAs affected by VMA expansion
FROMLIST: mm/mmap: write-lock VMAs in vma_adjust
FROMLIST: mm/mmap: write-lock VMAs before merging, splitting or expanding them
UPSTREAM: mm/khugepaged: write-lock VMA while collapsing a huge page
FROMLIST: mm/mmap: move VMA locking before vma_adjust_trans_huge call
UPSTREAM: mm: mark VMA as being written when changing vm_flags
UPSTREAM: mm: add per-VMA lock and helper functions to control it
UPSTREAM: mm: move mmap_lock assert function definitions
UPSTREAM: mm: rcu safe VMA freeing
UPSTREAM: mm: introduce CONFIG_PER_VMA_LOCK
UPSTREAM: mm: introduce vm_flags_reset_once to replace WRITE_ONCE vm_flags updates
UPSTREAM: mm: export dump_mm()
UPSTREAM: mm: introduce __vm_flags_mod and use it in untrack_pfn
UPSTREAM: mm: replace vma->vm_flags indirect modification in ksm_madvise
UPSTREAM: mm: replace vma->vm_flags direct modifications with modifier calls
UPSTREAM: mm: replace VM_LOCKED_CLEAR_MASK with VM_LOCKED_MASK
UPSTREAM: mm: introduce vma->vm_flags wrapper functions
UPSTREAM: kernel/fork: convert vma assignment to a memcpy
ANDROID: GKI: dentry: add Android ABI padding to some structures
ANDROID: GKI: sched: add Android ABI padding to some structures
ANDROID: GKI: elevator: add Android ABI padding to some structures
ANDROID: GKI: phy: add Android ABI padding to some structures
ANDROID: GKI: workqueue.h: add Android ABI padding to some structures
ANDROID: GKI: scsi: add Android ABI padding to some structures
ANDROID: GKI: device.h: add Android ABI padding to some structures
ANDROID: GKI: timer.h: add Android ABI padding to a structure
ANDROID: GKI: USB: add Android ABI padding to some structures
ANDROID: GKI: sched.h: add Android ABI padding to some structures
ANDROID: GKI: module.h: add Android ABI padding to some structures
ANDROID: GKI: sock.h: add Android ABI padding to some structures
ANDROID: GKI: sched: add Android ABI padding to some structures
ANDROID: GKI: mount.h: add Android ABI padding to some structures
ANDROID: GKI: mm: add Android ABI padding to some structures
ANDROID: GKI: add some padding to some driver core structures
ANDROID: GKI: add padding to struct HID structures
ANDROID: GKI: USB: XHCI: add Android ABI padding to lots of xhci structures
ANDROID: GKI: dwc3: add Android ABI padding to some structures
ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint
ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure
ANDROID: GKI: quota.h: add Android ABI padding to some structures
ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures
ANDROID: GKI: mm.h: add Android ABI padding to a structure
ANDROID: GKI: kobject.h: add Android ABI padding to some structures
ANDROID: GKI: kernfs.h: add Android ABI padding to some structures
ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure
ANDROID: GKI: ioport.h: add Android ABI padding to a structure
ANDROID: GKI: iomap.h: add Android ABI padding to a structure
ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure
ANDROID: GKI: genhd.h: add Android ABI padding to some structures
ANDROID: GKI: ethtool.h: add Android ABI padding to a structure
ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure
ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures
ANDROID: GKI: blk_types.h: add Android ABI padding to a structure
ANDROID: GKI: scsi.h: add Android ABI padding to a structure
ANDROID: GKI: pci: add Android ABI padding to some structures
ANDROID: GKI: add Android ABI padding to struct nf_conn
ANDROID: GKI: add kabi padding for structures for the android14 release
UPSTREAM: ipv{4,6}/raw: fix output xfrm lookup wrt protocol
UPSTREAM: inet: Add IP_LOCAL_PORT_RANGE socket option
UPSTREAM: sched/fair: Fixes for capacity inversion detection
UPSTREAM: sched/fair: Consider capacity inversion in util_fits_cpu()
UPSTREAM: sched/fair: Detect capacity inversion
ANDROID: KVM: arm64: Initialize hfgwtr_el2 correctly
UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
ANDROID: GKI: Add symbols and update symbol list for Unisoc(2nd)
ANDROID: ABI: update symbol list related to meminfo for galaxy
ANDROID: vendor_hooks: add hooks for extra memory
BACKPORT: FROMLIST: ovl: get_acl: Fix null pointer dereference at realinode in rcu-walk mode
BACKPORT: FROMLIST: ovl: ovl_permission: Fix null pointer dereference at realinode in rcu-walk mode
BACKPORT: FROMLIST: ovl: Let helper ovl_i_path_real() return the realinode
ANDROID: GKI: Update symbol list for xiaomi
ANDROID: vendor_hooks:vendor hook for control memory dirty rate
ANDROID: f2fs: enable cleancache
FROMGIT: userfaultfd: fix regression in userfaultfd_unmap_prep()
FROMGIT: BACKPORT: mm: avoid rewalk in mmap_region
FROMGIT: maple_tree: clear up index and last setting in single entry tree
FROMGIT: maple_tree: add mas_prev_range() and mas_find_range_rev interface
FROMGIT: maple_tree: introduce mas_prev_slot() interface
FROMGIT: maple_tree: relocate mas_rewalk() and mas_rewalk_if_dead()
FROMGIT: maple_tree: add mas_next_range() and mas_find_range() interfaces
FROMGIT: maple_tree: introduce mas_next_slot() interface
FROMGIT: maple_tree: try harder to keep active node with mas_prev()
FROMGIT: maple_tree: try harder to keep active node after mas_next()
FROMGIT: BACKPORT: mm/mmap: change do_vmi_align_munmap() for maple tree iterator changes
FROMLIST: BACKPORT: maple_tree: Refine mas_preallocate() node calculations
ANDROID: maple_tree: Move mas_wr_modify node size calculation to mas_wr_node_size()
FROMLIST: BACKPORT: maple_tree: Move mas_wr_end_piv() below mas_wr_extend_null()
ANDROID: mm: Fix __vma_adjust() writes for the maple tree
FROMLIST: BACKPORT: mm: Set up vma iterator for vma_iter_prealloc() calls
FROMGIT: maple_tree: avoid unnecessary ascending
FROMLIST: BACKPORT: mm: Change do_vmi_align_munmap() side tree index
UPSTREAM: mm/mmap: remove preallocation from do_mas_align_munmap()
ANDROID: abi_gki_aarch64_qcom: Update QCOM symbol list
ANDROID: GKI: Update symbol list for xiaomi
ANDROID: vendor_hooks:vendor hook for mmput
ANDROID: ABI: update symbol list for galaxy
ANDROID: task_mmu: add vendor hook for swap entry
ANDROID: mm: add vendor hooks in madvise for swap entry
BACKPORT: FROMLIST: arm64: mte: Simplify swap tag restoration logic
FROMLIST: mm: Call arch_swap_restore() from unuse_pte()
FROMLIST: mm: Call arch_swap_restore() from do_swap_page()
ANDROID: abi_gki_aarch64_qcom: Update symbol list
ANDROID: GKI: Update symbol list for xiaomi
ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath.
ANDROID: ABI: Update honor symbol list
ANDROID: mm: create vendor hooks for memory reclaim
UPSTREAM: kcsan: Avoid READ_ONCE() in read_instrumented_memory()
ANDROID: abi_gki_aarch64_qcom: update symbol list
ANDROID: Update ABI as part of crash fix
ANDROID: Fix incorrect hook declaration
ANDROID: abi_gki_aarch64_qcom: Add GIC and hibernation APIs
ANDROID: gic-v3: Export gic_v3_resume() for vendor GIC enhancements
ANDROID: irqchip/irq-gic-v3: Add vendor hook for gic suspend
ANDROID: abi_gki_aarch64_qcom: Update abi_gki_aarch64_qcom for DMA
Conflicts:
drivers/ufs/host/ufs-qcom.c
Change-Id: I9479fd1209d3769cd3c098554ddaceb31267f368
Signed-off-by: jianzhou <quic_jianzhou@quicinc.com>
603ba47616