From c2693a0ae83487011a229ae723f6bab82f2b8c63 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 4 Dec 2023 08:36:20 -0600 Subject: [PATCH] kernel-6.7.0-0.rc4.35 * Mon Dec 04 2023 Fedora Kernel Team [6.7.0-0.rc4.35] - Linux v6.7.0-0.rc4 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 7 ++++--- kernel-aarch64-16k-fedora.config | 7 ++++--- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-fedora.config | 7 ++++--- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 7 ++++--- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-fedora.config | 7 ++++--- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 7 ++++--- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 7 ++++--- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 7 ++++--- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 7 ++++--- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 7 ++++--- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.spec | 18 +++++++++++++++--- patch-6.7-redhat.patch | 16 ++++++++-------- sources | 6 +++--- 29 files changed, 82 insertions(+), 60 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index d737e5467..2d435bed7 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 = 32 +RHEL_RELEASE = 35 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 2c94e384a..d0c3d47f1 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -721,6 +721,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y CONFIG_BCACHEFS_DEBUG=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m CONFIG_BCACHEFS_LOCK_TIME_STATS=y # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4950,12 +4951,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -5241,7 +5242,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 8776a3931..496d35699 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -721,6 +721,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHEFS_DEBUG is not set # CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4924,12 +4925,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -5215,7 +5216,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 44f3337c0..1a354ba74 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -4336,7 +4336,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 0173360a9..121c177c3 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -4315,7 +4315,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index bd00eda4e..6de852177 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -721,6 +721,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y CONFIG_BCACHEFS_DEBUG=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m CONFIG_BCACHEFS_LOCK_TIME_STATS=y # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4950,12 +4951,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -5241,7 +5242,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 461f7553e..1403f7127 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4332,7 +4332,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e1b78c848..02699e7de 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -721,6 +721,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHEFS_DEBUG is not set # CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4924,12 +4925,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -5215,7 +5216,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8a108c5f5..14c93b885 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4311,7 +4311,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 66781475e..f97b83776 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -4377,7 +4377,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 32fe11ab8..93d9f5024 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -4356,7 +4356,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 958fdced9..d0d4cc8bd 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -487,6 +487,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y CONFIG_BCACHEFS_DEBUG=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m CONFIG_BCACHEFS_LOCK_TIME_STATS=y # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4152,12 +4153,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -4439,7 +4440,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ef9f30273..b24cd2e2e 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3988,7 +3988,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d2fb86321..43fdda920 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -485,6 +485,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHEFS_DEBUG is not set # CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4124,12 +4125,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -4411,7 +4412,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 67e296448..2a78b6c8b 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3968,7 +3968,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index dfb5edcff..cea77383b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -490,6 +490,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y CONFIG_BCACHEFS_DEBUG=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m CONFIG_BCACHEFS_LOCK_TIME_STATS=y # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4121,12 +4122,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -4408,7 +4409,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 5114dbb75..cee76c2c9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3968,7 +3968,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 0447b96ae..8daba7e61 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -488,6 +488,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHEFS_DEBUG is not set # CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4093,12 +4094,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -4380,7 +4381,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d90714727..ac49b4ee9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3948,7 +3948,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 9341b3c99..8d9a7513a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3960,7 +3960,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index a112de951..b2f5c2710 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -540,6 +540,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y CONFIG_BCACHEFS_DEBUG=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m CONFIG_BCACHEFS_LOCK_TIME_STATS=y # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4481,12 +4482,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -4771,7 +4772,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 736f18e22..12b8f9cc5 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4178,7 +4178,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index a04380ff0..cea8394c6 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -538,6 +538,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHEFS_DEBUG is not set # CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_FS=m # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set @@ -4455,12 +4456,12 @@ CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK_ACCT=m # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m @@ -4745,7 +4746,7 @@ CONFIG_NFC_ST21NFCA=m # CONFIG_NFC_ST_NCI_I2C is not set # CONFIG_NFC_ST_NCI_SPI is not set CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NFC_TRF7970A=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index c9f52eb21..cbccf436c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4158,7 +4158,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 50baf0eaf..6f9063386 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4223,7 +4223,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index c8f5adb32..13877fef8 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4203,7 +4203,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_PROTO_DCCP=y +# CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_DUP_NETDEV=m diff --git a/kernel.spec b/kernel.spec index c4467f4e7..59d40dbc9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc3.20231201git994d5c58e50e.32 +%define pkgrelease 0.rc4.35 %define kversion 6 -%define tarfile_release 6.7-rc3-134-g994d5c58e50e +%define tarfile_release 6.7-rc4 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20231201git994d5c58e50e.32%{?buildid}%{?dist} +%define specrelease 0.rc4.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,6 +3754,18 @@ fi\ # # %changelog +* Mon Dec 04 2023 Fedora Kernel Team [6.7.0-0.rc4.35] +- Linux v6.7.0-0.rc4 + +* Sun Dec 03 2023 Fedora Kernel Team [6.7.0-0.rc3.968f35f4ab1c.34] +- Linux v6.7.0-0.rc3.968f35f4ab1c + +* Sat Dec 02 2023 Fedora Kernel Team [6.7.0-0.rc3.815fb87b7530.33] +- redhat: disable iptables-legacy compatibility layer (Florian Westphal) +- redhat: disable dccp conntrack support (Florian Westphal) +- configs: enable netfilter_netlink_hook in fedora too (Florian Westphal) +- Linux v6.7.0-0.rc3.815fb87b7530 + * Fri Dec 01 2023 Fedora Kernel Team [6.7.0-0.rc3.994d5c58e50e.32] - ext4: Mark mounting fs-verity filesystems as tech-preview (Alexander Larsson) - erofs: Add tech preview markers at mount (Alexander Larsson) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 9abbbdf65..341b03b7f 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -127,7 +127,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 99db546fbb45..d6e3aee2009d 100644 +index 511b5616aa41..875344062780 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -703,10 +703,10 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index fa5dd71a80fa..060d68c0b331 100644 +index 02bb2cce423f..4a6287d7a22d 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1752,6 +1752,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1757,6 +1757,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; @@ -1556,7 +1556,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index f17a1113f3d6..23b73a1fd609 100644 +index 33e2a9b5d339..6ae1abc3f11c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1567,7 +1567,7 @@ index f17a1113f3d6..23b73a1fd609 100644 #include #include #include -@@ -3014,6 +3015,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -3031,6 +3032,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -1673,7 +1673,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 46a4c9c5ea96..d106f73f44f1 100644 +index 1be1ce522896..9ed15bf750dd 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -251,6 +251,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2123,7 +2123,7 @@ index 675332e49a7b..4a3cbddacef1 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index fa00dd503cbf..a93a331d023d 100644 +index 542a4bbb21bc..62161ceed2e2 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -2141,7 +2141,7 @@ index fa00dd503cbf..a93a331d023d 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4041,6 +4049,8 @@ static int __init init_sd(void) +@@ -4048,6 +4056,8 @@ static int __init init_sd(void) goto err_out_class; } diff --git a/sources b/sources index a41fd3c3e..51092b455 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc3-134-g994d5c58e50e.tar.xz) = ecbb0b1cc8c924a75c147c198e41593101fbe25da94ade48d40185508b5d157e1855331417a547e32b858e05581bf8cc192df8630f66b3717112b120a8e125ff -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = bcd8144f0db4eee69bbacb08c3e5de2285259e248d8c0ef9b03f1e254059e98ff102beacffbe9c2504d1f48c742565a32eea9c44290ce5330d6fae098b0164b7 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 85e77a14df4fe21626ae800fb53326d35fc96ea15f22dc308d8ca985cabe27254f91f95c25f1ac7c01479a471f6efa4e5387c8eed5aa37f9b68c6b2c817b56a4 +SHA512 (linux-6.7-rc4.tar.xz) = a2c9143c3b4cb6e354b814efb54e30959eb6d03df283408b81d21a06b862b9c5b68f1a397904c166148497b440705c8c8fda991eb1da40c9d01a584c65b5821d +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 8f755be6817ab2e216010471e85b4c08489b9682a2e07bb779e23391aa621fb94bcf6960659deb466458e28a1f566fcc9bd707bf5a58a0912f9d8f093de3dd9b +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = ab09941902e0de4ccf8fdca403c48bc0adc6ce8e0226373ff83e779cc9ee10d50ea29517e5f8ffb22764f43d9117e3d92a84d2932d4242adaa75a35d2425f8f6