Commit 19882ba6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge tag 'android14-5.15.189_r00' into android14-5.15



This merges the android14-5.15.189_r00 tag into the android14-5.15 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* 8db77ca6 Merge android14-5.15 into android14-5.15-lts
*   63d5f586 Merge 5.15.189 into android14-5.15-lts
|\
| * c7964837 Linux 5.15.189
| * 3e4028ef rseq: Fix segfault on registration when rseq_cs is non-zero
| * 4b934b78 x86: Fix X86_FEATURE_VERW_CLEAR definition
| * 562f207d x86/mm: Disable hugetlb page table sharing on 32-bit
| * 8312a1cc vhost-scsi: protect vq->log_used with vq->mutex
| * 02fd0c7d Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID
| * 1b297ab6 HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP Cameras
| * 68c0e3ad HID: Add IGNORE quirk for SMARTLINKTECHNOLOGY
| * 95f18433 vt: add missing notification when switching back to text mode
| * f174d73b HID: lenovo: Add support for ThinkPad X1 Tablet Thin Keyboard Gen2
| * acc94849 net: usb: qmi_wwan: add SIMCom 8230C composition
| * 78fe114f um: vector: Reduce stack usage in vector_eth_configure()
| * 8ea9a9fb atm: idt77252: Add missing `dma_map_error()`
| * 8d672a1a bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT
| * 0118fe8f bnxt_en: Fix DCB ETS validation
| * 8d11e48b net: ll_temac: Fix missing tx_pending check in ethtools_set_ringparam()
| * 0da557bb can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level
| * 6b08605e net: phy: microchip: limit 100M workaround to link-down events on LAN88xx
| * b2f5dfa8 net: appletalk: Fix device refcount leak in atrtr_create()
* | 050bae3a Merge a3aea97d ("netfilter: flowtable: account for Ethernet header in nf_flow_pppoe_proto()") into android14-5.15-lts
|\|
| * a3aea97d netfilter: flowtable: account for Ethernet header in nf_flow_pppoe_proto()
| * df525911 ksmbd: fix a mount write count leak in ksmbd_vfs_kern_path_locked()
| * fedd65b5 smb: server: make use of rdma_destroy_qp()
| * cb121c47 nbd: fix uaf in nbd_genl_connect() error path
| * 10c6021a raid10: cleanup memleak at raid10_make_request
| * 48da050b md/raid1: Fix stack memory use after return in raid1_reshape
| * b24f65c1 wifi: zd1211rw: Fix potential NULL pointer dereference in zd_mac_tx_to_dev()
| * 09064e6d dma-buf: fix timeout handling in dma_resv_wait_timeout v2
| * 419192cb dma-buf: use new iterator in dma_resv_wait_timeout
| * 84df80b4 dma-buf: add dma_resv_for_each_fence_unlocked v8
| * 3435a204 usb: dwc3: Abort suspend on soft disconnect failure
| * c1cb5c16 usb: cdnsp: Fix issue with CV Bad Descriptor test
| * ba3a2e44 usb: cdnsp: Replace snprintf() with the safer scnprintf() variant
| * 2991f28d usb:cdnsp: remove TRB_FLUSH_ENDPOINT command
| * 9a433cd8 Input: xpad - support Acer NGR 200 Controller
| * e9b894ca xhci: Disable stream for xHC controller with XHCI_BROKEN_STREAMS
| * e262ff8d usb: xhci: quirk for data loss in ISOC transfers
| * 59aca35c xhci: Allow RPM on the USB controller (1022:43f7) by default
| * 982beb75 virtio-net: ensure the received length does not exceed allocated size
* | 588d37cc Merge c47c83f6 ("netlink: make sure we allow at least one dump skb") into android14-5.15-lts
|\|
| * c47c83f6 netlink: make sure we allow at least one dump skb
* | 05a3855e Merge ccc9da90 ("netlink: Fix rmem check in netlink_broadcast_deliver().") into android14-5.15-lts
|\|
| * ccc9da90 netlink: Fix rmem check in netlink_broadcast_deliver().
* | 7cfaccdb Merge a2504279 ("pwm: mediatek: Ensure to disable clocks in error path") into android14-5.15-lts
|\|
| * a2504279 pwm: mediatek: Ensure to disable clocks in error path
| * d7684190 RDMA/mlx5: Fix vport loopback for MPV device
| * e774a693 btrfs: use btrfs_record_snapshot_destroy() during rmdir
| * 21ab2c7c btrfs: propagate last_unlink_trans earlier when doing a rmdir
| * d216d5a2 Revert "ACPI: battery: negate current when discharging"
* | 9edc248f Merge a5012673 ("usb: gadget: u_serial: Fix race condition in TTY wakeup") into android14-5.15-lts
|\|
| * a5012673 usb: gadget: u_serial: Fix race condition in TTY wakeup
| * 2f4df5d0 drm/gem: Fix race in drm_gem_handle_create_tail()
| * ef841f8e drm/sched: Increment job count before swapping tail spsc queue
| * cb4b08a0 pinctrl: qcom: msm: mark certain pins as invalid for interrupts
| * 0c1ad573 gre: Fix IPv6 multicast route creation.
| * e3154a48 x86/mce: Make sure CMCI banks are cleared during shutdown on Intel
| * 9f4431ba x86/mce: Don't remove sysfs if thresholding sysfs init fails
| * 9cd4fa64 x86/mce/amd: Fix threshold limit reset
| * ae0e0826 xen: replace xen_remap() with memremap()
| * f98bf80b jfs: fix null ptr deref in dtInsertEntry
| * 65ad600b bpf, sockmap: Fix skb refcnt race after locking changes
| * 2499fa28 aoe: avoid potential deadlock at set_capacity
| * 39d51370 thermal/int340x_thermal: handle data_vault when the value is ZERO_SIZE_PTR
* | b1dd162f Revert "bpf: fix precision backtracking instruction iteration"
* | beb3756a Merge e37e3b6c ("bpf: fix precision backtracking instruction iteration") into android14-5.15-lts
|\|
| * e37e3b6c bpf: fix precision backtracking instruction iteration
* | de8f988f Merge f5e72b78 ("rxrpc: Fix oops due to non-existence of prealloc backlog struct") into android14-5.15-lts
|\|
| * f5e72b78 rxrpc: Fix oops due to non-existence of prealloc backlog struct
| * d3091017 ice: safer stats processing
| * 32caa502 fs/proc: do_task_stat: use __for_each_thread()
* | ec772d64 Merge 25452638 ("net/sched: Abort __tc_modify_qdisc if parent class does not exist") into android14-5.15-lts
|\|
| * 25452638 net/sched: Abort __tc_modify_qdisc if parent class does not exist
* | fdde6516 Merge 7f1cad84 ("atm: clip: Fix NULL pointer dereference in vcc_sendmsg()") into android14-5.15-lts
|\|
| * 7f1cad84 atm: clip: Fix NULL pointer dereference in vcc_sendmsg()
| * 5641019d atm: clip: Fix infinite recursive call of clip_push().
| * 1c075e88 atm: clip: Fix memory leak of struct clip_vcc.
| * 3251ce39 atm: clip: Fix potential null-ptr-deref in to_atmarpd().
| * 66f9065c net: phy: smsc: Fix link failure in forced mode with Auto-MDIX
| * 29a5de38 net: phy: smsc: Fix Auto-MDIX configuration when disabled by strap
* | c5901022 Merge 0ba1021a ("vsock: Fix IOCTL_VM_SOCKETS_GET_LOCAL_CID to check also `transport_local`") into android14-5.15-lts
|\|
| * 0ba1021a vsock: Fix IOCTL_VM_SOCKETS_GET_LOCAL_CID to check also `transport_local`
* | 32488bfe Merge 36a43904 ("vsock: Fix transport_* TOCTOU") into android14-5.15-lts
|\|
| * 36a43904 vsock: Fix transport_* TOCTOU
* | 0755c469 Merge 80d7dc15 ("vsock: Fix transport_{g2h,h2g} TOCTOU") into android14-5.15-lts
|\|
| * 80d7dc15 vsock: Fix transport_{g2h,h2g} TOCTOU
* | d2b2dcbc Merge dab8ded2 ("tipc: Fix use-after-free in tipc_conn_close().") into android14-5.15-lts
|\|
| * dab8ded2 tipc: Fix use-after-free in tipc_conn_close().
* | a9f542c2 Revert "netlink: Fix wraparounds of sk->sk_rmem_alloc."
* | 5eeb7d3d Merge fd69af06 ("netlink: Fix wraparounds of sk->sk_rmem_alloc.") into android14-5.15-lts
|\|
| * fd69af06 netlink: Fix wraparounds of sk->sk_rmem_alloc.
* | 5409f1a0 Merge 552a0664 ("fix proc_sys_compare() handling of in-lookup dentries") into android14-5.15-lts
|\|
| * 552a0664 fix proc_sys_compare() handling of in-lookup dentries
* | 24bce44f Merge c0aec35f ("perf: Revert to requiring CAP_SYS_ADMIN for uprobes") into android14-5.15-lts
|\|
| * c0aec35f perf: Revert to requiring CAP_SYS_ADMIN for uprobes
* | e8589f09 Merge 2df3e265 ("ASoC: fsl_asrc: use internal measured ratio for non-ideal ratio mode") into android14-5.15-lts
|\|
| * 2df3e265 ASoC: fsl_asrc: use internal measured ratio for non-ideal ratio mode
* | 8e919eb7 Merge 87825fbd ("drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling") into android14-5.15-lts
|/
* 87825fbd drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling

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