From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Mar 2026 10:17:45 +0000 (+0100)
Subject: fix up merge mistakes in queue-6.19/series
X-Git-Tag: v6.18.19~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d8953d55b764cbb16a775fe1a1fdd2c32d2ca1d;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up merge mistakes in queue-6.19/series

my fault, ugh...
---

diff --git a/queue-6.19/ceph-add-a-bunch-of-missing-ceph_path_info-initializers.patch b/queue-6.19/ceph-add-a-bunch-of-missing-ceph_path_info-initializers.patch
index 029810df7c..ce6686a2a0 100644
--- a/queue-6.19/ceph-add-a-bunch-of-missing-ceph_path_info-initializers.patch
+++ b/queue-6.19/ceph-add-a-bunch-of-missing-ceph_path_info-initializers.patch
@@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  				path = NULL;
 --- a/fs/ceph/dir.c
 +++ b/fs/ceph/dir.c
-@@ -1363,7 +1363,7 @@ static int ceph_unlink(struct inode *dir
+@@ -1364,7 +1364,7 @@ static int ceph_unlink(struct inode *dir
  	if (!dn) {
  		try_async = false;
  	} else {
diff --git a/queue-6.19/series b/queue-6.19/series
index b106684f30..a42cf36b54 100644
--- a/queue-6.19/series
+++ b/queue-6.19/series
@@ -171,196 +171,6 @@ revert-usb-gadget-f_ncm-align-net_device-lifecycle-with-bind-unbind.patch
 revert-usb-gadget-u_ether-add-gether_opts-for-config-caching.patch
 usb-gadget-f_ncm-fix-net_device-lifecycle-with-device_move.patch
 mm-tracing-rss_stat-ensure-curr-is-false-from-kthread-context.patch
-remoteproc-qcom_wcnss-fix-reserved-region-mapping-fa.patch
-powerpc-uaccess-fix-inline-assembly-for-clang-build-.patch
-powerpc-kexec-core-use-big-endian-types-for-crash-va.patch
-powerpc-crash-adjust-the-elfcorehdr-size.patch
-remoteproc-sysmon-correct-subsys_name_len-type-in-qm.patch
-remoteproc-mediatek-unprepare-scp-clock-during-syste.patch
-powerpc-83xx-km83xx-fix-keymile-vendor-prefix.patch
-smb-server-fix-another-refcount-leak-in-smb2_open.patch
-scsi-storvsc-fix-scheduling-while-atomic-on-preempt_.patch
-acpi-pm-save-nvs-memory-on-lenovo-g70-35.patch
-scsi-ufs-core-reset-urgent_bkops_lvl-to-allow-runtim.patch
-fs-init-flags_valid-before-calling-vfs_fileattr_get.patch
-scsi-mpi3mr-add-null-checks-when-resetting-request-a.patch
-alsa-hda-realtek-fix-speaker-pop-on-star-labs-starfi.patch
-unshare-fix-unshare_fs-handling.patch
-wifi-mac80211-set-default-wmm-parameters-on-all-link.patch
-acpi-osi-add-dmi-quirk-for-acer-aspire-one-d255.patch
-scsi-ses-fix-devices-attaching-to-different-hosts.patch
-asoc-amd-yc-add-asus-expertbook-bm1503cda-to-quirk-t.patch
-asoc-cs42l43-report-insert-for-exotic-peripherals.patch
-scsi-ufs-core-fix-possible-null-pointer-dereference-.patch
-scsi-ufs-core-fix-shift-out-of-bounds-when-maxq-32.patch
-alsa-usb-audio-avoid-implicit-feedback-mode-on-diyin.patch
-drm-amdgpu-vcn5-add-smu-dpm-interface-type.patch
-alsa-usb-audio-check-max-frame-size-for-implicit-fee.patch
-nfs-return-eisdir-on-nfs3_proc_create-if-d_alias-is-.patch
-drm-msm-dpu-fix-lm-size-on-a-number-of-platforms.patch
-drm-msm-dsi-fix-hdisplay-calculation-when-programmin.patch
-xprtrdma-decrement-re_receiving-on-the-early-exit-pa.patch
-btrfs-hold-space_info-lock-when-clearing-periodic-re.patch
-drm-msm-a6xx-fix-the-bogus-protect-error-on-x2-85.patch
-workqueue-use-pool_bh-instead-of-wq_bh-when-checking.patch
-perf-disasm-fix-off-by-one-bug-in-outside-check.patch
-drm-msm-a8xx-fix-ubwc-config-related-to-swizzling.patch
-dt-bindings-display-msm-qcom-sm8750-mdss-fix-model-t.patch
-net-dsa-realtek-rtl8365mb-remove-ifoutdiscards-from-.patch
-drm-msm-dsi-fix-pclk-rate-calculation-for-bonded-dsi.patch
-drm-amd-pm-add-missing-od-setting-pp_od_feature_zero.patch
-drm-amd-pm-add-missing-od-setting-pp_od_feature_zero.patch-1062
-drm-amdgpu-fix-kernel-doc-comments-for-some-lut-prop.patch
-bonding-do-not-set-usable_slaves-for-broadcast-mode.patch
-bonding-handle-bond_link_fail-bond_link_back-as-vali.patch
-net-mlx5-fix-deadlock-between-devlink-lock-and-esw-w.patch
-net-mlx5-fix-crash-when-moving-to-switchdev-mode.patch
-net-mlx5-fix-peer-miss-rules-host-disabled-checks.patch
-net-mlx5e-fix-dma-fifo-desync-on-error-cqe-sq-recove.patch
-net-mlx5e-rx-fix-xdp-multi-buf-frag-counting-for-str.patch
-net-mlx5e-rx-fix-xdp-multi-buf-frag-counting-for-leg.patch
-net-sched-teql-fix-null-pointer-dereference-in-iptun.patch
-rxrpc-afs-fix-missing-error-pointer-check-after-rxrp.patch
-net-spacemit-fix-error-handling-in-emac_alloc_rx_des.patch
-net-spacemit-fix-error-handling-in-emac_tx_mem_map.patch
-drm-sitronix-st7586-fix-bad-pixel-data-due-to-byte-s.patch
-firmware-cs_dsp-fix-fragmentation-regression-in-firm.patch
-spi-amlogic-spifc-a4-fix-dma-mapping-error-handling.patch
-spi-rockchip-sfc-fix-double-free-in-remove-callback.patch
-asoc-soc-core-drop-delayed_work_pending-check-before.patch
-asoc-soc-core-flush-delayed-work-before-removing-dai.patch
-asoc-simple-card-utils-fix-graph_util_is_ports0-for-.patch
-net-sfp-improve-huawei-ma5671a-fixup.patch
-serial-caif-hold-tty-link-reference-in-ldisc_open-an.patch
-bnxt_en-fix-rss-table-size-check-when-changing-ethto.patch
-drm-i915-dp-read-alpm-caps-after-dpcd-init.patch
-net-enetc-fix-incorrect-fallback-phy-address-handlin.patch
-net-enetc-do-not-skip-setting-labcr-mdio_phyad_prtad.patch
-mctp-i2c-fix-skb-memory-leak-in-receive-path.patch
-can-hi311x-hi3110_open-add-check-for-hi3110_power_en.patch
-bonding-fix-type-confusion-in-bond_setup_by_slave.patch
-mctp-route-hold-key-lock-in-mctp_flow_prepare_output.patch
-amd-xgbe-fix-link-status-handling-in-xgbe_rx_adaptat.patch
-amd-xgbe-prevent-crc-errors-during-rx-adaptation-wit.patch
-amd-xgbe-reset-phy-settings-before-starting-phy.patch
-net-add-xmit-recursion-limit-to-tunnel-xmit-function.patch
-netfilter-nf_tables-fix-for-duplicate-device-in-netd.patch
-netfilter-nf_tables-always-walk-all-pending-catchall.patch
-netfilter-nft_set_pipapo-fix-stack-out-of-bounds-rea.patch
-netfilter-x_tables-guard-option-walkers-against-1-by.patch
-netfilter-nfnetlink_queue-fix-entry-leak-in-bridge-v.patch
-netfilter-nfnetlink_cthelper-fix-oob-read-in-nfnl_ct.patch
-netfilter-xt_idletimer-reject-rev0-reuse-of-alarm-ti.patch
-perf-annotate-fix-hashmap__new-error-checking.patch
-regulator-pca9450-correct-interrupt-type.patch
-regulator-pca9450-correct-probed-name-for-pca9452.patch
-perf-ftrace-fix-hashmap__new-error-checking.patch
-sched-idle-make-skipping-governor-callbacks-more-con.patch
-nvme-pci-fix-slab-out-of-bounds-in-nvme_dbbuf_set.patch
-nvme-pci-fix-race-bug-in-nvme_poll_irqdisable.patch
-drivers-net-ice-fix-devlink-parameters-get-without-i.patch
-iavf-fix-ptp-use-after-free-during-reset.patch
-iavf-fix-incorrect-reset-handling-in-callbacks.patch
-accel-amdxdna-fix-runtime-suspend-deadlock-when-ther.patch
-asoc-codecs-rt1011-use-component-to-get-the-dapm-con.patch
-i40e-fix-src-ip-mask-checks-and-memcpy-argument-name.patch
-e1000-e1000e-fix-leak-in-dma-error-cleanup.patch
-page_pool-store-detach_time-as-ktime_t-to-avoid-fals.patch
-net-bcmgenet-fix-broken-eee-by-converting-to-phylib-.patch
-acpi-osl-fix-__iomem-type-on-return-from-acpi_os_map.patch
-asoc-amd-acp3x-rt5682-max9836-add-missing-error-chec.patch
-asoc-detect-empty-dmi-strings.patch
-drm-amdkfd-unreserve-bo-if-queue-update-failed.patch
-asoc-amd-acp-mach-common-add-missing-error-check-for.patch
-io_uring-fix-physical-sqe-bounds-check-for-sqe_mixed.patch
-perf-synthetic-events-fix-stale-build-id-in-module-m.patch
-net-bonding-fix-nd_tbl-null-dereference-when-ipv6-is.patch
-net-dsa-realtek-fix-led-group-port-bit-for-non-zero-.patch
-neighbour-restore-protocol-0-check-in-pneigh-update.patch
-net-mana-null-service_wq-on-setup-error-to-prevent-d.patch
-net-ethernet-ti-am65-cpsw-nuss-fix-rx_filter-value-f.patch
-octeontx2-af-devlink-fix-nix-ras-reporter-recovery-c.patch
-octeontx2-af-devlink-fix-nix-ras-reporter-to-use-ras.patch
-net-prevent-null-deref-in-ip-6-tunnel_xmit.patch
-iio-imu-inv-mpu9150-fix-irq-ack-preventing-irq-storm.patch
-usb-gadget-f_mass_storage-fix-potential-integer-over.patch
-drm-amdgpu-ensure-no_hw_access-is-visible-before-mmio.patch
-cgroup-fix-race-between-task-migration-and-iteration.patch
-sched_ext-remove-redundant-css_put-in-scx_cgroup_init.patch
-cgroup-don-t-expose-dead-tasks-in-cgroup.patch
-alsa-pcm-fix-use-after-free-on-linked-stream-runtime-in-snd_pcm_drain.patch
-alsa-usb-audio-check-endpoint-numbers-at-parsing-scarlett2-mixer-interfaces.patch
-can-gs_usb-gs_can_open-always-configure-bitrates-before-starting-device.patch
-net-usb-lan78xx-fix-silent-drop-of-packets-with-checksum-errors.patch
-net-usb-lan78xx-fix-tx-byte-statistics-for-small-packets.patch
-net-usb-lan78xx-fix-warn-in-__netif_napi_del_locked-on-disconnect.patch
-net-usb-lan78xx-skip-ltm-configuration-for-lan7850.patch
-gpib-lpvo_usb-fix-unintended-binding-of-ftdi-8u232am-devices.patch
-rust_binder-fix-oneway-spam-detection.patch
-rust_binder-check-ownership-before-using-vma.patch
-rust_binder-avoid-reading-the-written-value-in-offsets-array.patch
-rust_binder-call-set_notification_done-without-proc-lock.patch
-rust-kbuild-allow-unused_features.patch
-rust-kbuild-emit-dep-info-into-depfile-directly.patch
-rust-str-make-nullterminatedformatter-public.patch
-ata-libata-core-add-bridge_ok-quirk-for-qemu-drives.patch
-asoc-amd-yc-add-dmi-quirk-for-asus-expertbook-pm1503cda.patch
-kvm-arm64-fix-protected-mode-handling-of-pages-larger-than-4kb.patch
-kvm-x86-introduce-kvm_x86_quirk_vmcs12_allow_freeze_in_smm.patch
-kvm-svm-initialize-avic-vmcb-fields-if-avic-is-enabled-with-in-kernel-apic.patch
-kvm-svm-set-clear-cr8-write-interception-when-avic-is-de-activated.patch
-kvm-arm64-pkvm-fallback-to-level-3-mapping-on-host-stage-2-fault.patch
-kvm-arm64-vgic-pick-eoicount-deactivations-from-ap-list-tail.patch
-kvm-arm64-pkvm-don-t-reprobe-for-ich_vtr_el2.tds-on-cpu-hotplug.patch
-usb-add-quirk_no_bos-for-video-capture-several-devices.patch
-usb-core-quirks-add-huawei-me906s-device-to-wakeup-quirk.patch
-usb-ezcap401-needs-usb_quirk_no_bos-to-function-on-10gbs-usb-speed.patch
-usb-xhci-fix-memory-leak-in-xhci_disable_slot.patch
-usb-xhci-prevent-interrupt-storm-on-host-controller-error-hce.patch
-xhci-fix-null-pointer-dereference-when-reading-portli-debugfs-files.patch
-usb-yurex-fix-race-in-probe.patch
-usb-dwc3-pci-add-support-for-the-intel-nova-lake-h.patch
-usb-misc-uss720-properly-clean-up-reference-in-uss720_probe.patch
-usb-core-don-t-power-off-roothub-phys-if-phy_set_mode-fails.patch
-usb-cdc-acm-restore-cap_brk-functionnality-to-ch343.patch
-usb-roles-get-usb-role-switch-from-parent-only-for-usb-b-connector.patch
-usb-typec-altmode-displayport-set-displayport-signaling-rate-in-configure-message.patch
-usb-usbcore-introduce-usb_bulk_msg_killable.patch
-usb-usbtmc-use-usb_bulk_msg_killable-with-user-specified-timeouts.patch
-usb-core-limit-the-length-of-unkillable-synchronous-timeouts.patch
-usb-class-cdc-wdm-fix-reordering-issue-in-read-code-path.patch
-usb-renesas_usbhs-fix-use-after-free-in-isr-during-device-removal.patch
-usb-gadget-f_hid-fix-superspeed-descriptors.patch
-usb-mdc800-handle-signal-and-read-racing.patch
-usb-gadget-uvc-fix-interval_duration-calculation.patch
-usb-image-mdc800-kill-download-urb-on-timeout.patch
-usb-gadget-f_tcm-fix-null-pointer-dereferences-in-nexus-handling.patch
-usb-gadget-f_ncm-fix-atomic-context-locking-issue.patch
-usb-legacy-ncm-fix-npe-in-gncm_bind.patch
-revert-usb-gadget-f_ncm-fix-atomic-context-locking-issue.patch
-revert-usb-legacy-ncm-fix-npe-in-gncm_bind.patch
-revert-usb-gadget-u_ether-add-auto-cleanup-helper-for-freeing-net_device.patch
-revert-usb-gadget-f_ncm-align-net_device-lifecycle-with-bind-unbind.patch
-revert-usb-gadget-u_ether-add-gether_opts-for-config-caching.patch
-usb-gadget-f_ncm-fix-net_device-lifecycle-with-device_move.patch
-mm-tracing-rss_stat-ensure-curr-is-false-from-kthread-context.patch
-mm-kfence-fix-kasan-hardware-tag-faults-during-late-enablement.patch
-mmc-mmci-fix-device_node-reference-leak-in-of_get_dml_pipe_index.patch
-mm-kfence-disable-kfence-upon-kasan-hw-tags-enablement.patch
-mmc-sdhci-brcmstb-use-correct-register-offset-for-v1-pin_sel-restore.patch
-mmc-dw_mmc-rockchip-fix-runtime-pm-support-for-internal-phase-support.patch
-mmc-core-avoid-bitfield-rmw-for-claim-retune-flags.patch
-asoc-qcom-qdsp6-fix-q6apm-remove-ordering-during-adsp-stop-and-start.patch
-tipc-fix-divide-by-zero-in-tipc_sk_filter_connect.patch
-firmware-stratix10-rsu-fix-null-pointer-dereference-when-rsu-is-disabled.patch
-kprobes-avoid-crash-when-rmmod-insmod-after-ftrace-killed.patch
-ceph-add-a-bunch-of-missing-ceph_path_info-initializers.patch
-libceph-fix-potential-out-of-bounds-access-in-ceph_handle_auth_reply.patch
-drm-gud-fix-null-crtc-dereference-on-display-disable.patch
-libceph-reject-preamble-if-control-segment-is-empty.patch
-libceph-prevent-potential-out-of-bounds-reads-in-process_message_header.patch
-libceph-use-u32-for-non-negative-values-in-ceph_monmap_decode.patch
-libceph-admit-message-frames-only-in-ceph_con_s_open-state.patch
 ceph-fix-i_nlink-underrun-during-async-unlink.patch
 ceph-do-not-skip-the-first-folio-of-the-next-object-in-writeback.patch
 ceph-fix-memory-leaks-in-ceph_mdsc_build_path.patch
@@ -398,23 +208,3 @@ libceph-reject-preamble-if-control-segment-is-empty.patch
 libceph-prevent-potential-out-of-bounds-reads-in-process_message_header.patch
 libceph-use-u32-for-non-negative-values-in-ceph_monmap_decode.patch
 libceph-admit-message-frames-only-in-ceph_con_s_open-state.patch
-ceph-fix-i_nlink-underrun-during-async-unlink.patch
-ceph-do-not-skip-the-first-folio-of-the-next-object-in-writeback.patch
-ceph-fix-memory-leaks-in-ceph_mdsc_build_path.patch
-alsa-usb-audio-improve-focusrite-sample-rate-filteri.patch
-objtool-klp-fix-detection-of-corrupt-static-branch-c.patch
-objtool-fix-data-alignment-in-elf_add_data.patch
-objtool-fix-another-stack-overflow-in-validate_branc.patch
-irqchip-riscv-aplic-preserve-aplic-states-across-sus.patch
-irqchip-riscv-aplic-do-not-clear-acpi-dependencies-o.patch
-irqchip-riscv-aplic-register-syscore-operations-only.patch
-time-jiffies-mark-jiffies_64_to_clock_t-notrace.patch
-sched-mmcid-prevent-cid-stalls-due-to-concurrent-for.patch
-sched-mmcid-handle-vfork-clone_vm-correctly.patch
-sched-mmcid-remove-pointless-preempt-guard.patch
-sched-mmcid-avoid-full-tasklist-walks.patch
-i3c-dw-i3c-master-set-sir_reject-in-dat-on-device-at.patch
-powerpc-perf-check-that-current-mm-is-alive-before-g.patch
-scsi-ufs-core-fix-serror-in-ufshcd_rtc_work-during-u.patch
-scsi-qla2xxx-completely-fix-fcport-double-free.patch
-scsi-hisi_sas-fix-null-pointer-exception-during-user.patch