From 1cd2b19add9b26204f551c7b86465b28a5c7d24d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 2 May 2025 08:50:38 -0600 Subject: [PATCH] kernel-6.15.0-0.rc4.20250502gitebd297a2affa.39 * Fri May 02 2025 Fedora Kernel Team [6.15.0-0.rc4.ebd297a2affa.39] - redhat/configs: aarch64: Enable Apple touchbar display driver for Fedora (Neal Gompa) - Linux v6.15.0-0.rc4.ebd297a2affa Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- def_variants.yaml.rhel | 21 ------ filtermods.py | 5 +- kernel-aarch64-16k-debug-fedora.config | 8 +- kernel-aarch64-16k-fedora.config | 10 ++- kernel-aarch64-debug-fedora.config | 8 +- kernel-aarch64-fedora.config | 10 ++- kernel-aarch64-rt-64k-debug-fedora.config | 8 +- kernel-aarch64-rt-64k-fedora.config | 10 ++- kernel-aarch64-rt-debug-fedora.config | 8 +- kernel-aarch64-rt-fedora.config | 10 ++- kernel-ppc64le-debug-fedora.config | 6 +- kernel-ppc64le-fedora.config | 8 +- kernel-riscv64-debug-fedora.config | 6 +- kernel-riscv64-fedora.config | 8 +- kernel-riscv64-rt-debug-fedora.config | 6 +- kernel-riscv64-rt-fedora.config | 8 +- kernel-s390x-debug-fedora.config | 6 +- kernel-s390x-fedora.config | 8 +- kernel-x86_64-debug-fedora.config | 6 +- kernel-x86_64-fedora.config | 8 +- kernel-x86_64-rt-debug-fedora.config | 6 +- kernel-x86_64-rt-fedora.config | 8 +- kernel.changelog | 14 ++++ kernel.spec | 92 ++++++++--------------- patch-6.15-redhat.patch | 12 +-- sources | 6 +- 27 files changed, 158 insertions(+), 150 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index b3d2cecd2..d9ac776dd 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 37 +RHEL_RELEASE = 39 # # RHEL_REBASE_NUM diff --git a/def_variants.yaml.rhel b/def_variants.yaml.rhel index 0f158f53d..f4b1f927a 100644 --- a/def_variants.yaml.rhel +++ b/def_variants.yaml.rhel @@ -12,14 +12,6 @@ packages: depends-on: - modules-core - modules - - name: modules-rt-kvm - if_variant_in: ["rt"] - depends-on: - - modules-core - - name: modules-rt-64k-kvm - if_variant_in: ["rt-64k"] - depends-on: - - modules-core - name: modules-partner depends-on: - modules-core @@ -30,11 +22,6 @@ rules: exact_pkg: True - .*test[^/]*.ko: modules-internal - - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm - if_variant_in: ["rt"] - - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-64k-kvm - if_variant_in: ["rt-64k"] - - arch/.*: modules-core - block/t10-pi.ko: modules-core - crypto/.*: modules-core @@ -84,10 +71,6 @@ rules: - drivers/gpio/gpio-dln2.*: modules-extra - drivers/gpio/gpio-ljca.*: modules - drivers/gpio/.*: modules-core - - drivers/gpu/drm/i915/kvmgt.*: modules-rt-kvm - if_variant_in: ["rt"] - - drivers/gpu/drm/i915/kvmgt.*: modules-rt-64k-kvm - if_variant_in: ["rt-64k"] - drivers/gpu/drm/display/drm_.*: modules-core - drivers/gpu/drm/drm.*: modules-core - drivers/gpu/drm/etnaviv/.*: modules-core @@ -264,10 +247,6 @@ rules: - drivers/powercap/intel_rapl_tpmi.*: modules - drivers/powercap/.*: modules-core - drivers/pps/.*: modules-core - - drivers/ptp/ptp_kvm.*: modules-rt-kvm - if_variant_in: ["rt"] - - drivers/ptp/ptp_kvm.*: modules-rt-64k-kvm - if_variant_in: ["rt-64k"] - drivers/ptp/ptp_mock.*: modules-internal - drivers/ptp/ptp_dfl_tod.*: modules - drivers/ptp/.*: modules-core diff --git a/filtermods.py b/filtermods.py index fbfe56c5c..53f6a0912 100755 --- a/filtermods.py +++ b/filtermods.py @@ -823,11 +823,12 @@ class FiltermodTests(unittest.TestCase): do_pictures=FiltermodTests.do_pictures, variants=['rt']) - self.assertIsNotNone(self.pkg_list.get('rt-kvm')) + self.assertIsNotNone(self.pkg_list.get('modules-other')) self._is_kmod_pkg('kmod1', 'modules-core') self._is_kmod_pkg('kmod2', 'modules-core') self._is_kmod_pkg('kmod3', 'modules') - self._is_kmod_pkg('kmod4', 'rt-kvm') + self._is_kmod_pkg('kmod4', 'modules-other') + def test2(self): self.pkg_list, self.kmod_list = sort_kmods(get_td('test2.dep'), get_td('test2.yaml'), diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 3df639d95..47e18fe4b 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -2260,7 +2260,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5313,7 +5313,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5585,7 +5585,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5604,7 +5604,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 515654f18..a6f2c73cc 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -2251,7 +2251,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5286,7 +5286,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5558,7 +5558,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5577,7 +5577,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index c9af76f6f..4bd4b7bc3 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2260,7 +2260,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5313,7 +5313,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5585,7 +5585,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5604,7 +5604,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 57c74161d..357e64473 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -2251,7 +2251,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5286,7 +5286,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5558,7 +5558,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5577,7 +5577,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index fef9260a5..605a000ed 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -2266,7 +2266,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5321,7 +5321,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5593,7 +5593,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5612,7 +5612,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index 734ecc24e..deee5a0b0 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -2257,7 +2257,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5294,7 +5294,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5566,7 +5566,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5585,7 +5585,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 99ee4de3a..0c7565b73 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -2263,7 +2263,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5318,7 +5318,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5590,7 +5590,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5609,7 +5609,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index a57eb1f85..e7a1b5fd1 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -2254,7 +2254,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m -# CONFIG_DRM_PANEL_SUMMIT is not set +CONFIG_DRM_PANEL_SUMMIT=m # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set @@ -5291,7 +5291,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5563,7 +5563,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5582,7 +5582,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b5d26605a..a52600636 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4361,7 +4361,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4629,7 +4629,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4648,7 +4648,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index de13bf886..ab43d3388 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -52,7 +52,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y CONFIG_ACPI_FAN=y @@ -4333,7 +4333,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4601,7 +4601,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4620,7 +4620,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 6381e4b79..35e89eacd 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -4386,7 +4386,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4654,7 +4654,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4673,7 +4673,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 4c81c444c..b285694a9 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -4358,7 +4358,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4626,7 +4626,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4645,7 +4645,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 98d308e5b..59635b579 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -4391,7 +4391,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4659,7 +4659,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4678,7 +4678,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index d3d49f088..a31bb1937 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -4363,7 +4363,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4631,7 +4631,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4650,7 +4650,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4b3093795..49ebc9e7f 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4337,7 +4337,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4605,7 +4605,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4624,7 +4624,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 29da53b79..914757326 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y CONFIG_ACPI_FAN=y @@ -4309,7 +4309,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -4577,7 +4577,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -4596,7 +4596,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 2578ac988..ba4b16dc8 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4764,7 +4764,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5034,7 +5034,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5054,7 +5054,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ead4fc451..4c17bdb2b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -56,7 +56,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y # CONFIG_ACPI_EC_DEBUGFS is not set @@ -4738,7 +4738,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5008,7 +5008,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5028,7 +5028,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 90110be6b..d536e976f 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -4769,7 +4769,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5039,7 +5039,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5059,7 +5059,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index a06c16825..2b21a3dc3 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -56,7 +56,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y # CONFIG_ACPI_EC_DEBUGFS is not set @@ -4743,7 +4743,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m @@ -5013,7 +5013,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NFC_PN532_UART=m @@ -5033,7 +5033,9 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST95HF is not set # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y diff --git a/kernel.changelog b/kernel.changelog index 7d142c56e..0a49fe467 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,17 @@ +* Fri May 02 2025 Fedora Kernel Team [6.15.0-0.rc4.ebd297a2affa.39] +- redhat/configs: aarch64: Enable Apple touchbar display driver for Fedora (Neal Gompa) +- Linux v6.15.0-0.rc4.ebd297a2affa +Resolves: + +* Thu May 01 2025 Fedora Kernel Team [6.15.0-0.rc4.4f79eaa2ceac.38] +- redhat: remove kernel-rt-kvm package (Clark Williams) +- redhat: introduce modules-extra-matched meta package (Jan Stancek) +- Fix up some Netfilter configs for Fedora (Justin M. Forbes) +- Turn NF_CT_NETLINK_TIMEOUT for Fedora (Justin M. Forbes) +- Turn on NF_CONNTRACK_TIMEOUT for Fedora (Justin M. Forbes) +- Linux v6.15.0-0.rc4.4f79eaa2ceac +Resolves: + * Wed Apr 30 2025 Fedora Kernel Team [6.15.0-0.rc4.b6ea1680d0ac.37] - redhat/configs: Adjust CONFIG_TUNE for s390x (Mete Durlu) - Linux v6.15.0-0.rc4.b6ea1680d0ac diff --git a/kernel.spec b/kernel.spec index 54be3f19a..08fd55fa0 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.rc4.20250430gitb6ea1680d0ac.37 +%define pkgrelease 0.rc4.20250502gitebd297a2affa.39 %define kversion 6 -%define tarfile_release 6.15-rc4-42-gb6ea1680d0ac +%define tarfile_release 6.15-rc4-147-gebd297a2affa # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20250430gitb6ea1680d0ac.37%{?buildid}%{?dist} +%define specrelease 0.rc4.20250502gitebd297a2affa.39%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -692,6 +692,7 @@ ExclusiveOS: Linux Requires: kernel-core-uname-r = %{KVERREL} Requires: kernel-modules-uname-r = %{KVERREL} Requires: kernel-modules-core-uname-r = %{KVERREL} +Requires: ((kernel-modules-extra-uname-r = %{KVERREL}) if kernel-modules-extra-matched) Provides: installonlypkg(kernel) %endif @@ -1442,6 +1443,13 @@ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\ This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\ %{nil} +%define kernel_modules_extra_matched_package(m) \ +%package modules-extra-matched\ +Summary: Meta package which requires modules-extra to be installed for all kernels.\ +%description modules-extra-matched\ +This meta package provides a single reference that other packages can Require to have modules-extra installed for all kernels.\ +%{nil} + # # This macro creates a kernel--modules-internal package. # %%kernel_modules_internal_package @@ -1543,6 +1551,7 @@ summary: kernel meta-package for the %{1} kernel\ Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{uname_suffix %{1}}\ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\ +Requires: ((kernel-%{1}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{1}}) if kernel-modules-extra-matched)\ %if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\ Requires: realtime-setup\ %endif\ @@ -1551,25 +1560,6 @@ Provides: installonlypkg(kernel)\ The meta-package for the %{1} kernel\ %{nil} -%if %{with_realtime} || %{with_realtime_arm64_64k} -# -# this macro creates a kernel-rt--kvm package -# %%kernel_kvm_package -# -%define kernel_kvm_package() \ -%package %{?1:%{1}-}kvm\ -Summary: KVM modules for package kernel%{?1:-%{1}}\ -Group: System Environment/Kernel\ -Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\ -Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\ -Provides: installonlypkg(kernel-module)\ -Provides: kernel%{?1:-%{1}}-kvm-%{_target_cpu} = %{version}-%{release}\ -AutoReq: no\ -%description -n kernel%{?1:-%{1}}-kvm\ -This package provides KVM modules for package kernel%{?1:-%{1}}.\ -%{nil} -%endif - # # This macro creates a kernel- and its -devel and -debuginfo too. # %%define variant_summary The Linux kernel compiled for @@ -1600,10 +1590,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{ %endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ -%if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\ -%{expand:%%kernel_kvm_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ -%else \ -%if %{with_efiuki}\ +%if %{with_efiuki} && ("%{1}" != "rt" && "%{1}" != "rt-debug" && "%{1}" != "rt-64k" && "%{1}" != "rt-64k-debug")\ %package %{?1:%{1}-}uki-virt\ Summary: %{variant_summary} unified kernel image for virtual machines\ Provides: installonlypkg(kernel)\ @@ -1618,7 +1605,6 @@ Provides: installonlypkg(kernel)\ Requires: kernel%{?1:-%{1}}-uki-virt = %{specrpmversion}-%{release}\ Requires(pre): systemd >= 254-1\ %endif\ -%endif\ %if %{with_gcov}\ %{expand:%%kernel_gcov_package %{?1:%{1}}}\ %endif\ @@ -1846,6 +1832,8 @@ Prebuilt 64k unified kernel image for virtual machines. Prebuilt 64k unified kernel image addons for virtual machines. %endif +%kernel_modules_extra_matched_package + %define log_msg() \ { set +x; } 2>/dev/null \ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \ @@ -2876,12 +2864,6 @@ BuildKernel() { create_module_file_list "kernel" ../modules.list ../kernel${Variant:+-${Variant}}-modules.list 0 0 create_module_file_list "internal" ../modules-internal.list ../kernel${Variant:+-${Variant}}-modules-internal.list 0 1 create_module_file_list "kernel" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0 1 - if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then - create_module_file_list "kvm" ../modules-rt-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-kvm.list 0 1 - fi - if [[ "$Variant" == "rt-64k" || "$Variant" == "rt-64k-debug" ]]; then - create_module_file_list "kvm" ../modules-rt-64k-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-64k-kvm.list 0 1 - fi %if 0%{!?fedora:1} create_module_file_list "partner" ../modules-partner.list ../kernel${Variant:+-${Variant}}-modules-partner.list 1 1 %endif @@ -3693,21 +3675,6 @@ fi\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ %{nil} -%if %{with_realtime} || %{with_realtime_arm64_64k} -# -# This macro defines a %%post script for a kernel*-kvm package. -# It also defines a %%postun script that does the same thing. -# %%kernel_kvm_post [] -# -%define kernel_kvm_post() \ -%{expand:%%post %{?1:%{1}-}kvm}\ -/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ -%{nil}\ -%{expand:%%postun %{?1:%{1}-}kvm}\ -/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ -%{nil} -%endif - # # This macro defines a %%post script for a kernel*-modules package. # It also defines a %%postun script that does the same thing. @@ -3873,7 +3840,6 @@ fi\ %if %{with_realtime_base} %kernel_variant_preun -v rt %kernel_variant_post -v rt -r kernel -%kernel_kvm_post rt %endif %if %{with_automotive_base} @@ -3884,7 +3850,6 @@ fi\ %if %{with_realtime} && %{with_debug} %kernel_variant_preun -v rt-debug %kernel_variant_post -v rt-debug -%kernel_kvm_post rt-debug %endif %if %{with_realtime_arm64_64k_base} @@ -4181,14 +4146,7 @@ fi\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ %endif\ %endif\ -%if "%{3}" == "rt" || "%{3}" == "rt-debug" || "%{3}" == "rt-64k" || "%{3}" == "rt-64k-debug"\ -%if "%{3}" == "rt" || "%{3}" == "rt-debug"\ -%{expand:%%files -f kernel-%{?3:%{3}-}modules-rt-kvm.list %{?3:%{3}-}kvm}\ -%else\ -%{expand:%%files -f kernel-%{?3:%{3}-}modules-rt-64k-kvm.list %{?3:%{3}-}kvm}\ -%endif\ -%else\ -%if %{with_efiuki}\ +%if %{with_efiuki} && "%{3}" != "rt" && "%{3}" != "rt-debug" && "%{3}" != "rt-64k" && "%{3}" != "rt-64k-debug"\ %{expand:%%files %{?3:%{3}-}uki-virt}\ %dir /lib/modules\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ @@ -4203,7 +4161,6 @@ fi\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi.extra.d/ \ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi.extra.d/*.addon.efi\ %endif\ -%endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ %endif\ @@ -4266,11 +4223,28 @@ fi\ %kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug %endif +%files modules-extra-matched + # plz don't put in a version string unless you're going to tag # and build. # # %changelog +* Fri May 02 2025 Justin M. Forbes [6.15.0-0.rc4.20250502gitebd297a2affa.39] +- Turn on ACPI_DEBUG for Fedora (Justin M. Forbes) + +* Fri May 02 2025 Fedora Kernel Team [6.15.0-0.rc4.ebd297a2affa.39] +- redhat/configs: aarch64: Enable Apple touchbar display driver for Fedora (Neal Gompa) +- Linux v6.15.0-0.rc4.ebd297a2affa + +* Thu May 01 2025 Fedora Kernel Team [6.15.0-0.rc4.4f79eaa2ceac.38] +- redhat: remove kernel-rt-kvm package (Clark Williams) +- redhat: introduce modules-extra-matched meta package (Jan Stancek) +- Fix up some Netfilter configs for Fedora (Justin M. Forbes) +- Turn NF_CT_NETLINK_TIMEOUT for Fedora (Justin M. Forbes) +- Turn on NF_CONNTRACK_TIMEOUT for Fedora (Justin M. Forbes) +- Linux v6.15.0-0.rc4.4f79eaa2ceac + * Wed Apr 30 2025 Fedora Kernel Team [6.15.0-0.rc4.b6ea1680d0ac.37] - redhat/configs: Adjust CONFIG_TUNE for s390x (Mete Durlu) - Linux v6.15.0-0.rc4.b6ea1680d0ac diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 527062a86..f56803d1c 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -190,7 +190,7 @@ index 000000000000..85771d74c34f + +endmenu diff --git a/Makefile b/Makefile -index 5aa9ee52a765..f02d241e6b4e 100644 +index 94be5dfb81fb..f0c337e2cd55 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -230,7 +230,7 @@ index 5aa9ee52a765..f02d241e6b4e 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1330,7 +1353,13 @@ define filechk_version.h +@@ -1323,7 +1346,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -245,7 +245,7 @@ index 5aa9ee52a765..f02d241e6b4e 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) -@@ -1932,6 +1961,23 @@ endif +@@ -1925,6 +1954,23 @@ endif ifdef CONFIG_MODULES @@ -2417,10 +2417,10 @@ index bf3bbac4e02a..b9840b1a43fe 100644 LSM_HOOK(int, 0, perf_event_open, int type) LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) diff --git a/include/linux/module.h b/include/linux/module.h -index d94b196d5a34..ead452836a9f 100644 +index b3329110d668..c96ec5f62ea5 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -428,6 +428,7 @@ struct module { +@@ -430,6 +430,7 @@ struct module { struct module_attribute *modinfo_attrs; const char *version; const char *srcversion; @@ -2428,7 +2428,7 @@ index d94b196d5a34..ead452836a9f 100644 struct kobject *holders_dir; /* Exported symbols */ -@@ -1017,4 +1018,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, +@@ -1019,4 +1020,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, #endif /* CONFIG_MODULES && CONFIG_KALLSYMS */ diff --git a/sources b/sources index 8434f33c3..19f232c7b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc4-42-gb6ea1680d0ac.tar.xz) = d95fde12bf6cccd9bf835cabbe527a8d2dfedca05ccc94de08237e494255b3292295de49b9f1d84720085576ef73e1c549e8998c9c4e7f32774963fc087343d5 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 182e9508fe96bc6194195198ba103e2e345239b5538f8b6a0aea73e6fd28205659a5bd90c05e8492a6d4421797757cc67eabce84056c3a7c7bafbe4f652eb8ab -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 6256e3ff383dfb3d902040c3fe9ce5ed73343c314e6f5bd90994c6e91c8c995e31108014b6b3eb5341df073ce772cd6f42872b3727c6c828ddb1aee064a6e165 +SHA512 (linux-6.15-rc4-147-gebd297a2affa.tar.xz) = 7d290817aed0934a1547dc9ed6b784499a71b254717fa8eda006a19806a282b901588026de02121c0c1e2a52cad4124a39123d22431277c271ca097b88587fd6 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 97270d56011b14ec842bea8f4afbe0c7e181c034c1f17e2797435719124e6d3b312404d1a463d5e38245b07a8e2e976a74e3ded57efd104da123659554c89bfb +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 15dd96a9ade9ddddc88256ee7535bde056691314cb36d4e5a7a135f292fb8974d2746ccd659c2ba6a74458d406204ad68c0221d7db74b249e24c31002da1bc80