From aceb1fabb4d572891f4bddb2f0163f8c871da993 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 18 Apr 2025 09:21:31 -0600 Subject: [PATCH] kernel-6.15.0-0.rc2.20250418gitfc96b232f8e7.25 * Fri Apr 18 2025 Fedora Kernel Team [6.15.0-0.rc2.fc96b232f8e7.25] - Turn on USB Gadget for Fedora x86 (Justin M. Forbes) - Linux v6.15.0-0.rc2.fc96b232f8e7 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 -- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rt-debug-fedora.config | 2 +- kernel-aarch64-rt-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 41 +++++++++++++++++++++++++- kernel-x86_64-fedora.config | 41 +++++++++++++++++++++++++- kernel-x86_64-rt-debug-fedora.config | 41 +++++++++++++++++++++++++- kernel-x86_64-rt-fedora.config | 41 +++++++++++++++++++++++++- kernel.changelog | 5 ++-- kernel.spec | 14 +++++---- patch-6.15-redhat.patch | 18 +---------- sources | 6 ++-- 15 files changed, 182 insertions(+), 40 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index c9c586ff0..3ddb09c2b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/659655f4ff3c52bf384f6bb8b85065434a48148f - 659655f4ff3c52bf384f6bb8b85065434a48148f apply -Wno-error=unterminated-string-initialization temporarily - https://gitlab.com/cki-project/kernel-ark/-/commit/99c8b56381c2f05815c77e6e41380b3d23559ea0 99c8b56381c2f05815c77e6e41380b3d23559ea0 mei: vsc: Fix fortify-panic caused by invalid counted_by() use diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index a788124fb..a67e58354 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -9583,7 +9583,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_EEM=y -# CONFIG_USB_CONFIGFS_F_FS is not set +CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y # CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index ae00d51c8..97070de4f 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -9552,7 +9552,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_EEM=y -# CONFIG_USB_CONFIGFS_F_FS is not set +CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y # CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 9034ba8f5..359e1cb68 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -9582,7 +9582,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_EEM=y -# CONFIG_USB_CONFIGFS_F_FS is not set +CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y # CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6eb2d997c..b00ee7dce 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -9551,7 +9551,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_EEM=y -# CONFIG_USB_CONFIGFS_F_FS is not set +CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y # CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 6691ad337..64b211fb0 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -9593,7 +9593,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_EEM=y -# CONFIG_USB_CONFIGFS_F_FS is not set +CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y # CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index d795776fe..dbfd74bce 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -9562,7 +9562,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_EEM=y -# CONFIG_USB_CONFIGFS_F_FS is not set +CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y # CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3ccd1682c..f2921bb81 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -8369,6 +8369,7 @@ CONFIG_USB4_NET=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m CONFIG_USB_ALI_M5632=y +# CONFIG_USB_AMD5536UDC is not set CONFIG_USB_AN2720=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_APPLEDISPLAY=m @@ -8376,6 +8377,7 @@ CONFIG_USB_ARMLINUX=y CONFIG_USB_ATM=m # CONFIG_USB_AUDIO is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +# CONFIG_USB_BDC_UDC is not set CONFIG_USB_BELKIN=y # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_CATC=m @@ -8393,8 +8395,27 @@ CONFIG_USB_CHIPIDEA_IMX=m CONFIG_USB_CHIPIDEA_MSM=m CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_PRINTER is not set +CONFIG_USB_CONFIGFS_F_TCM=y +# CONFIG_USB_CONFIGFS_F_UAC1 is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_OBEX=y +# CONFIG_USB_CONFIGFS_RNDIS is not set +CONFIG_USB_CONFIGFS_SERIAL=y # CONFIG_USB_CONN_GPIO is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -8402,9 +8423,11 @@ CONFIG_USB_CXACRU=m CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DSBR=m +CONFIG_USB_DUMMY_HCD=m # CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_DWC2 is not set # CONFIG_USB_DWC2_PERIPHERAL is not set +# CONFIG_USB_DWC3_DUAL_ROLE is not set # CONFIG_USB_DWC3_GADGET is not set # CONFIG_USB_DWC3_HAPS is not set CONFIG_USB_DWC3_HOST=y @@ -8413,6 +8436,7 @@ CONFIG_USB_DWC3=m CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_ULPI is not set # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_EG20T is not set # CONFIG_USB_EHCI_FSL is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_HCD=y @@ -8429,14 +8453,21 @@ CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_GADGET_VBUS_DRAW=100 +# CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_G_DBGP is not set # CONFIG_USB_G_HID is not set CONFIG_USB_GL860=m # CONFIG_USB_G_MULTI is not set # CONFIG_USB_G_NCM is not set +# CONFIG_USB_GOKU is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_GR_UDC is not set @@ -8528,6 +8559,7 @@ CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_LJCA=m CONFIG_USB_M5602=m +# CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_MAX3420_UDC=m @@ -8540,6 +8572,10 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MV_U3D is not set +CONFIG_USB_MV_UDC=m +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m @@ -8586,7 +8622,9 @@ CONFIG_USB_PULSE8_CEC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_PWC=m +# CONFIG_USB_PXA27X is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_R8A66597 is not set CONFIG_USB_RAINSHADOW_CEC=m # CONFIG_USB_RAREMONO is not set CONFIG_USB_RAW_GADGET=m @@ -8710,6 +8748,7 @@ CONFIG_USERCOPY_KUNIT_TEST=m # CONFIG_USER_DECRYPTED_DATA is not set # CONFIG_USER_EVENTS is not set CONFIG_USERFAULTFD=y +CONFIG_U_SERIAL_CONSOLE=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTIL_MACROS_KUNIT=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b6f800f51..700e7c76d 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -8338,6 +8338,7 @@ CONFIG_USB4_NET=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m CONFIG_USB_ALI_M5632=y +# CONFIG_USB_AMD5536UDC is not set CONFIG_USB_AN2720=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_APPLEDISPLAY=m @@ -8345,6 +8346,7 @@ CONFIG_USB_ARMLINUX=y CONFIG_USB_ATM=m # CONFIG_USB_AUDIO is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +# CONFIG_USB_BDC_UDC is not set CONFIG_USB_BELKIN=y # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_CATC=m @@ -8362,8 +8364,27 @@ CONFIG_USB_CHIPIDEA_IMX=m CONFIG_USB_CHIPIDEA_MSM=m CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_PRINTER is not set +CONFIG_USB_CONFIGFS_F_TCM=y +# CONFIG_USB_CONFIGFS_F_UAC1 is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_OBEX=y +# CONFIG_USB_CONFIGFS_RNDIS is not set +CONFIG_USB_CONFIGFS_SERIAL=y # CONFIG_USB_CONN_GPIO is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -8371,9 +8392,11 @@ CONFIG_USB_CXACRU=m CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DSBR=m +CONFIG_USB_DUMMY_HCD=m # CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_DWC2 is not set # CONFIG_USB_DWC2_PERIPHERAL is not set +# CONFIG_USB_DWC3_DUAL_ROLE is not set # CONFIG_USB_DWC3_GADGET is not set # CONFIG_USB_DWC3_HAPS is not set CONFIG_USB_DWC3_HOST=y @@ -8382,6 +8405,7 @@ CONFIG_USB_DWC3=m CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_ULPI is not set # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_EG20T is not set # CONFIG_USB_EHCI_FSL is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_HCD=y @@ -8398,14 +8422,21 @@ CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_GADGET_VBUS_DRAW=100 +# CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_G_DBGP is not set # CONFIG_USB_G_HID is not set CONFIG_USB_GL860=m # CONFIG_USB_G_MULTI is not set # CONFIG_USB_G_NCM is not set +# CONFIG_USB_GOKU is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_GR_UDC is not set @@ -8497,6 +8528,7 @@ CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_LJCA=m CONFIG_USB_M5602=m +# CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_MAX3420_UDC=m @@ -8509,6 +8541,10 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MV_U3D is not set +CONFIG_USB_MV_UDC=m +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m @@ -8555,7 +8591,9 @@ CONFIG_USB_PULSE8_CEC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_PWC=m +# CONFIG_USB_PXA27X is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_R8A66597 is not set CONFIG_USB_RAINSHADOW_CEC=m # CONFIG_USB_RAREMONO is not set CONFIG_USB_RAW_GADGET=m @@ -8679,6 +8717,7 @@ CONFIG_USERCOPY_KUNIT_TEST=m # CONFIG_USER_DECRYPTED_DATA is not set # CONFIG_USER_EVENTS is not set CONFIG_USERFAULTFD=y +CONFIG_U_SERIAL_CONSOLE=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTIL_MACROS_KUNIT=m diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 26b00f770..387986904 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -8380,6 +8380,7 @@ CONFIG_USB4_NET=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m CONFIG_USB_ALI_M5632=y +# CONFIG_USB_AMD5536UDC is not set CONFIG_USB_AN2720=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_APPLEDISPLAY=m @@ -8387,6 +8388,7 @@ CONFIG_USB_ARMLINUX=y CONFIG_USB_ATM=m # CONFIG_USB_AUDIO is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +# CONFIG_USB_BDC_UDC is not set CONFIG_USB_BELKIN=y # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_CATC=m @@ -8404,8 +8406,27 @@ CONFIG_USB_CHIPIDEA_IMX=m CONFIG_USB_CHIPIDEA_MSM=m CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_PRINTER is not set +CONFIG_USB_CONFIGFS_F_TCM=y +# CONFIG_USB_CONFIGFS_F_UAC1 is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_OBEX=y +# CONFIG_USB_CONFIGFS_RNDIS is not set +CONFIG_USB_CONFIGFS_SERIAL=y # CONFIG_USB_CONN_GPIO is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -8413,9 +8434,11 @@ CONFIG_USB_CXACRU=m CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DSBR=m +CONFIG_USB_DUMMY_HCD=m # CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_DWC2 is not set # CONFIG_USB_DWC2_PERIPHERAL is not set +# CONFIG_USB_DWC3_DUAL_ROLE is not set # CONFIG_USB_DWC3_GADGET is not set # CONFIG_USB_DWC3_HAPS is not set CONFIG_USB_DWC3_HOST=y @@ -8424,6 +8447,7 @@ CONFIG_USB_DWC3=m CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_ULPI is not set # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_EG20T is not set # CONFIG_USB_EHCI_FSL is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_HCD=y @@ -8440,14 +8464,21 @@ CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_GADGET_VBUS_DRAW=100 +# CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_G_DBGP is not set # CONFIG_USB_G_HID is not set CONFIG_USB_GL860=m # CONFIG_USB_G_MULTI is not set # CONFIG_USB_G_NCM is not set +# CONFIG_USB_GOKU is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_GR_UDC is not set @@ -8539,6 +8570,7 @@ CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_LJCA=m CONFIG_USB_M5602=m +# CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_MAX3420_UDC=m @@ -8551,6 +8583,10 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MV_U3D is not set +CONFIG_USB_MV_UDC=m +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m @@ -8597,7 +8633,9 @@ CONFIG_USB_PULSE8_CEC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_PWC=m +# CONFIG_USB_PXA27X is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_R8A66597 is not set CONFIG_USB_RAINSHADOW_CEC=m # CONFIG_USB_RAREMONO is not set CONFIG_USB_RAW_GADGET=m @@ -8721,6 +8759,7 @@ CONFIG_USERCOPY_KUNIT_TEST=m # CONFIG_USER_DECRYPTED_DATA is not set # CONFIG_USER_EVENTS is not set CONFIG_USERFAULTFD=y +CONFIG_U_SERIAL_CONSOLE=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTIL_MACROS_KUNIT=m diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 1492a759f..e8e243005 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -8349,6 +8349,7 @@ CONFIG_USB4_NET=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m CONFIG_USB_ALI_M5632=y +# CONFIG_USB_AMD5536UDC is not set CONFIG_USB_AN2720=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_APPLEDISPLAY=m @@ -8356,6 +8357,7 @@ CONFIG_USB_ARMLINUX=y CONFIG_USB_ATM=m # CONFIG_USB_AUDIO is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +# CONFIG_USB_BDC_UDC is not set CONFIG_USB_BELKIN=y # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_CATC=m @@ -8373,8 +8375,27 @@ CONFIG_USB_CHIPIDEA_IMX=m CONFIG_USB_CHIPIDEA_MSM=m CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set CONFIG_USB_CONFIGFS_F_MIDI2=y +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_PRINTER is not set +CONFIG_USB_CONFIGFS_F_TCM=y +# CONFIG_USB_CONFIGFS_F_UAC1 is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_OBEX=y +# CONFIG_USB_CONFIGFS_RNDIS is not set +CONFIG_USB_CONFIGFS_SERIAL=y # CONFIG_USB_CONN_GPIO is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -8382,9 +8403,11 @@ CONFIG_USB_CXACRU=m CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DSBR=m +CONFIG_USB_DUMMY_HCD=m # CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_DWC2 is not set # CONFIG_USB_DWC2_PERIPHERAL is not set +# CONFIG_USB_DWC3_DUAL_ROLE is not set # CONFIG_USB_DWC3_GADGET is not set # CONFIG_USB_DWC3_HAPS is not set CONFIG_USB_DWC3_HOST=y @@ -8393,6 +8416,7 @@ CONFIG_USB_DWC3=m CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_ULPI is not set # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_EG20T is not set # CONFIG_USB_EHCI_FSL is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_HCD=y @@ -8409,14 +8433,21 @@ CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_GADGET_VBUS_DRAW=100 +# CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_G_DBGP is not set # CONFIG_USB_G_HID is not set CONFIG_USB_GL860=m # CONFIG_USB_G_MULTI is not set # CONFIG_USB_G_NCM is not set +# CONFIG_USB_GOKU is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_GR_UDC is not set @@ -8508,6 +8539,7 @@ CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_LJCA=m CONFIG_USB_M5602=m +# CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_MAX3420_UDC=m @@ -8520,6 +8552,10 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MV_U3D is not set +CONFIG_USB_MV_UDC=m +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m @@ -8566,7 +8602,9 @@ CONFIG_USB_PULSE8_CEC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_PWC=m +# CONFIG_USB_PXA27X is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_R8A66597 is not set CONFIG_USB_RAINSHADOW_CEC=m # CONFIG_USB_RAREMONO is not set CONFIG_USB_RAW_GADGET=m @@ -8690,6 +8728,7 @@ CONFIG_USERCOPY_KUNIT_TEST=m # CONFIG_USER_DECRYPTED_DATA is not set # CONFIG_USER_EVENTS is not set CONFIG_USERFAULTFD=y +CONFIG_U_SERIAL_CONSOLE=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTIL_MACROS_KUNIT=m diff --git a/kernel.changelog b/kernel.changelog index 0e745a178..02e462ef8 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,5 +1,6 @@ -* Thu Apr 17 2025 Fedora Kernel Team [6.15.0-0.rc2.cfb2e2c57aef.25] -- apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Fri Apr 18 2025 Fedora Kernel Team [6.15.0-0.rc2.fc96b232f8e7.25] +- Turn on USB Gadget for Fedora x86 (Justin M. Forbes) +- Linux v6.15.0-0.rc2.fc96b232f8e7 Resolves: * Thu Apr 17 2025 Fedora Kernel Team [6.15.0-0.rc2.cfb2e2c57aef.24] diff --git a/kernel.spec b/kernel.spec index 39408ef6f..779d4b95c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.15.0 %define specversion 6.15.0 %define patchversion 6.15 -%define pkgrelease 0.rc2.20250417gitcfb2e2c57aef.25 +%define pkgrelease 0.rc2.20250418gitfc96b232f8e7.25 %define kversion 6 -%define tarfile_release 6.15-rc2-87-gcfb2e2c57aef +%define tarfile_release 6.15-rc2-278-gfc96b232f8e7 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20250417gitcfb2e2c57aef.25%{?buildid}%{?dist} +%define specrelease 0.rc2.20250418gitfc96b232f8e7.25%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4184,8 +4184,12 @@ fi\ # # %changelog -* Thu Apr 17 2025 Fedora Kernel Team [6.15.0-0.rc2.cfb2e2c57aef.25] -- apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Fri Apr 18 2025 Justin M. Forbes [6.15.0-0.rc2.20250418gitfc96b232f8e7.25] +- Enable FunctionFS on aarch64 + x86 (Sam Day) + +* Fri Apr 18 2025 Fedora Kernel Team [6.15.0-0.rc2.fc96b232f8e7.25] +- Turn on USB Gadget for Fedora x86 (Justin M. Forbes) +- Linux v6.15.0-0.rc2.fc96b232f8e7 * Thu Apr 17 2025 Fedora Kernel Team [6.15.0-0.rc2.cfb2e2c57aef.24] - redhat: enable drm panic screen with a QR code (Scott Weaver) diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index cd267a9de..ed264875d 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -71,13 +71,12 @@ kernel/rh_messages.c | 414 ++++++++++++++++ kernel/rh_messages.h | 326 +++++++++++++ kernel/rh_waived.c | 104 ++++ - scripts/Makefile.extrawarn | 4 + scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 79 files changed, 2744 insertions(+), 219 deletions(-) + 78 files changed, 2740 insertions(+), 219 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index d9fd26b95b34..aeafaa431ecd 100644 @@ -4407,21 +4406,6 @@ index 000000000000..84e22b1730cc + return 0; +} +late_initcall(__add_rh_flag); -diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn -index d75897559d18..08226fdd309d 100644 ---- a/scripts/Makefile.extrawarn -+++ b/scripts/Makefile.extrawarn -@@ -20,6 +20,10 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) - KBUILD_CFLAGS += -Wmissing-declarations - KBUILD_CFLAGS += -Wmissing-prototypes - -+# temporarily disable a warning to allow compiling with gcc15, as suggested by -+# Jakub Jelinek in https://bugzilla.redhat.com/show_bug.cgi?id=2338533#c7 -+KBUILD_CFLAGS += $(call cc-option,-Wno-error=unterminated-string-initialization) -+ - ifneq ($(CONFIG_FRAME_WARN),0) - KBUILD_CFLAGS += -Wframe-larger-than=$(CONFIG_FRAME_WARN) - endif diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index be89921d60b6..63e2f2ec68f0 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index 874b07bf2..c9cd2a725 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc2-87-gcfb2e2c57aef.tar.xz) = e9eddd50e6580f87aab0d60892086821d47e20694c2753e4f6f0fe04867f9099279ad6839f833cd2cfef6a065dd444d78ca2bf915826452d884ccdd0f2b312d5 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 966aee53b06c1e023c971a349f83c75d79abcffd69f4a825168bfb0e29b08291ee84e9ea8db53640eefd502a17032069d3afb3bc40ad8fc773bca2cd0c3cea9a -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = c5b85918d8280c5d3e21a9f0b57cbad021fc6df9c0695a75d3ae3564b03b8a0b00a5781df2cfc4d8d38b5e25ed1e7190858babc6e9a286d957703515546a408a +SHA512 (linux-6.15-rc2-278-gfc96b232f8e7.tar.xz) = 704a859f1b6d8024be221d5bfa9338c80fc04bd5b7fafbfd90b7dd7499865f805d172c84879795b3456b64909515489dccad5df822ec50ed124822f9f7fd7f54 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 6d48d1bc2941e10827562af95debfd7050d2ae6b9e1b22b222fbc45fbc0ece2bd38e03b869423dc984bcf7cb3ac40ad7008cd0f18b68c0b06d4718b63222ee79 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = b0c2aa65c7f1aa3873f37a3c560528e163cfe99381caa11cf0d39e826258e840013fd8cf1743292f791864d83fe6821f1268a3489fa9384687cbf6e45c7fc857