diff --git a/0001-xen-xenbus-check-otherend_id-only-after-it-has-been-.patch b/0001-xen-xenbus-check-otherend_id-only-after-it-has-been-.patch deleted file mode 100644 index 7d176ab3..00000000 --- a/0001-xen-xenbus-check-otherend_id-only-after-it-has-been-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 00fcc430d3b5e9d1e4b4da3e8eccb4fe0eac7876 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= - -Date: Sat, 1 Aug 2026 01:19:18 +0200 -Subject: [PATCH] xen/xenbus: check otherend_id only after it has been - initialized -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When device just got initialized (for example on module load), the -otherend_id field is initialized only after -xenbus_read_otherend_details() gets called. If xenstore watch triggers -xenbus_dev_changed() before that, it might consider still zeroed -otherend_id field (not matching actual xenstore content) as a sign of -device state reset. It can happen because xenstore watch are handled in -another thread (xenwatch), which can run in parallel to the initial -device probe running at module load. In that case, it would call -device_unregister(), which would deadlock against device probe from -module init. - -Fix this by considering dev->otherend_id change only after dev->otherend -is set (which happen after otherend_id is initialized). - -Signed-off-by: Marek Marczykowski-Górecki ---- - drivers/xen/xenbus/xenbus_probe.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c -index a259c8f0fff4..b42d8d2e5a33 100644 ---- a/drivers/xen/xenbus/xenbus_probe.c -+++ b/drivers/xen/xenbus/xenbus_probe.c -@@ -680,7 +680,8 @@ void xenbus_dev_changed(const char *node, struct xen_bus_type *bus) - dev->otherend_id); - - if (state == XenbusStateInitialising && -- (state != dev->state || backend != dev->otherend_id)) { -+ (state != dev->state || -+ (dev->otherend && backend != dev->otherend_id))) { - /* - * State has been reset, assume the old one vanished - * and new one needs to be probed. --- -2.54.0 - diff --git a/0001-xen-xenbus-log-more-information-when-device-state-go.patch b/0001-xen-xenbus-log-more-information-when-device-state-go.patch deleted file mode 100644 index de1a8ba8..00000000 --- a/0001-xen-xenbus-log-more-information-when-device-state-go.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2ee49295c56339e22ffdd7547a86a0c707cbcf23 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= - -Date: Thu, 30 Jul 2026 16:11:49 +0200 -Subject: [PATCH] xen/xenbus: log more information when device state got reset -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Ease diagnosing what actually changed. - -Signed-off-by: Marek Marczykowski-Górecki ---- - drivers/xen/xenbus/xenbus_probe.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c -index eb260eceb4d2..a259c8f0fff4 100644 ---- a/drivers/xen/xenbus/xenbus_probe.c -+++ b/drivers/xen/xenbus/xenbus_probe.c -@@ -686,7 +686,8 @@ void xenbus_dev_changed(const char *node, struct xen_bus_type *bus) - * and new one needs to be probed. - */ - dev_warn(&dev->dev, -- "state reset occurred, reconnecting\n"); -+ "state reset occurred (xenstore state %u, local state %u, xenstore backend %u, local backend %u), reconnecting\n", -+ state, dev->state, backend, dev->otherend_id); - dev->vanished = true; - } - if (dev->vanished) { --- -2.54.0 - diff --git a/config-base b/config-base index e9039a20..a55d5a79 100644 --- a/config-base +++ b/config-base @@ -1,4 +1,4 @@ -# Base config based on Fedora's config (kernel-core-7.2.4-300.fc45.rpm) +# Base config based on Fedora's config (kernel-core-7.2.6-300.fc45.rpm) # Only modification is `yes '' | make oldconfig` to drop config settings which # depend on Fedora patches and adjust for the small version difference. CONFIG_CC_VERSION_TEXT="gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2)" @@ -38,7 +38,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_UAPI_HEADER_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="7.2.4-300.fc45.x86_64" +CONFIG_BUILD_SALT="7.2.6-300.fc45.x86_64" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -3205,6 +3205,7 @@ CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m # CONFIG_FIREWIRE_KUNIT_DEVICE_ATTRIBUTE_TEST is not set CONFIG_FIREWIRE_KUNIT_PACKET_SERDES_TEST=m CONFIG_FIREWIRE_KUNIT_SELF_ID_SEQUENCE_HELPER_TEST=m +CONFIG_FIREWIRE_KUNIT_NODE_TREE_TEST=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_KUNIT_OHCI_SERDES_TEST=m CONFIG_FIREWIRE_SBP2=m @@ -4379,7 +4380,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set -# CONFIG_TOUCHSCREEN_HIDEEP is not set +CONFIG_TOUCHSCREEN_HIDEEP=m CONFIG_TOUCHSCREEN_HIMAX_HX852X=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m @@ -8525,10 +8526,10 @@ CONFIG_USB_CDNS3_PCI_WRAP=m CONFIG_USB_CDNSP_PCI=m # CONFIG_USB_MUSB_HDRC is not set CONFIG_USB_DWC3=m -# CONFIG_USB_DWC3_ULPI is not set -CONFIG_USB_DWC3_HOST=y +CONFIG_USB_DWC3_ULPI=y +# CONFIG_USB_DWC3_HOST is not set # CONFIG_USB_DWC3_GADGET is not set -# CONFIG_USB_DWC3_DUAL_ROLE is not set +CONFIG_USB_DWC3_DUAL_ROLE=y # # Platform Glue Driver Support @@ -10329,7 +10330,9 @@ CONFIG_IIO_ST_LSM6DSX=m CONFIG_IIO_ST_LSM6DSX_I2C=m CONFIG_IIO_ST_LSM6DSX_SPI=m CONFIG_IIO_ST_LSM6DSX_I3C=m -# CONFIG_IIO_ST_LSM9DS0 is not set +CONFIG_IIO_ST_LSM9DS0=m +CONFIG_IIO_ST_LSM9DS0_I2C=m +# CONFIG_IIO_ST_LSM9DS0_SPI is not set # end of Inertial measurement units CONFIG_IIO_ADIS_LIB=m @@ -10343,7 +10346,7 @@ CONFIG_ACPI_ALS=m CONFIG_ADUX1020=m CONFIG_AL3000A=m CONFIG_AL3010=m -# CONFIG_AL3320A is not set +CONFIG_AL3320A=m CONFIG_APDS9160=m # CONFIG_APDS9300 is not set CONFIG_APDS9306=m @@ -10601,7 +10604,7 @@ CONFIG_PWM=y # CONFIG_PWM_DEBUG is not set CONFIG_PWM_PROVIDE_GPIO=y # CONFIG_PWM_CLK is not set -CONFIG_PWM_CRC=y +CONFIG_PWM_CRC=m CONFIG_PWM_CROS_EC=m CONFIG_PWM_DWC_CORE=m CONFIG_PWM_DWC=m @@ -10648,7 +10651,7 @@ CONFIG_PHY_NXP_TJA1145=m # CONFIG_PHY_CPCAP_USB is not set # CONFIG_PHY_QCOM_USB_HS is not set # CONFIG_PHY_QCOM_USB_HSIC is not set -# CONFIG_PHY_TUSB1210 is not set +CONFIG_PHY_TUSB1210=m # end of PHY Subsystem CONFIG_POWERCAP=y @@ -10926,11 +10929,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_KUNIT_TEST=m CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_NTFS_FS is not set -CONFIG_NTFS3_FS=m -# CONFIG_NTFS3_64BIT_CLUSTER is not set -CONFIG_NTFS3_LZX_XPRESS=y -CONFIG_NTFS3_FS_POSIX_ACL=y +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_FS_POSIX_ACL=y +# CONFIG_NTFS3_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems # diff --git a/kernel.spec.in b/kernel.spec.in index f2d5d64f..25562e4d 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -144,8 +144,6 @@ Patch27: 0001-amdgpu-timeout.patch Patch30: 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch Patch31: 0001-PCI-add-a-reset-quirk-for-Intel-I219LM-ethernet-adap.patch Patch34: 0001-rust-fixup.patch -Patch35: 0001-xen-xenbus-log-more-information-when-device-state-go.patch -Patch36: 0001-xen-xenbus-check-otherend_id-only-after-it-has-been-.patch Patch37: 0001-ALSA-hda-realtek-Limit-Star-Labs-internal-mic-boost.patch Patch38: 0002-ALSA-hda-realtek-Add-StarFighter-HDA-SSID.patch Patch39: 0001-drm_xe_limit_sg_segment_size_to_page_size_on_xen_pv.patch diff --git a/version b/version index 8aea167e..ba6a7620 100644 --- a/version +++ b/version @@ -1 +1 @@ -7.2.5 +7.2.6