kernel-6.4.6-200

* Mon Jul 24 2023 Augusto Caringi <acaringi@redhat.com> [6.4.6-0] - Change pathfix.py to %%py3_shebang_fix (Justin M. Forbes) - Add config option coming to a stable update soon (Justin M. Forbes) - Linux v6.4.6 Resolves: Signed-off-by: Augusto Caringi <acaringi@redhat.com>
2023-07-24 16:31:30 -03:00 · 2023-07-24 16:31:30 -03:00 · 3d919c0f98
parent 05344083c3
commit 3d919c0f98
11 changed files with 26 additions and 13 deletions
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@ -219,6 +219,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMD_XGBE_DCB is not set
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 # CONFIG_AMT is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANON_VMA_NAME is not set
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@ -219,6 +219,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMD_XGBE_DCB is not set
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 # CONFIG_AMT is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANON_VMA_NAME is not set
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -250,6 +250,7 @@ CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
 CONFIG_AMLOGIC_THERMAL=m
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 CONFIG_AMT=m
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDERFS=y
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -219,6 +219,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMD_XGBE_DCB is not set
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 # CONFIG_AMT is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANON_VMA_NAME is not set
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -250,6 +250,7 @@ CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
 CONFIG_AMLOGIC_THERMAL=m
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 CONFIG_AMT=m
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDERFS=y
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -219,6 +219,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMD_XGBE_DCB is not set
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 # CONFIG_AMT is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANON_VMA_NAME is not set
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@ -221,6 +221,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMD_XGBE_DCB is not set
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 # CONFIG_AMT is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANON_VMA_NAME is not set
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@ -221,6 +221,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMD_XGBE_DCB is not set
 CONFIG_AMD_XGBE=m
 # CONFIG_AMIGA_PARTITION is not set
+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 # CONFIG_AMT is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANON_VMA_NAME is not set
--- a/kernel.spec
+++ b/kernel.spec
@ -171,18 +171,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specrpmversion 6.4.4
-%define specversion 6.4.4
+%define specrpmversion 6.4.6
+%define specversion 6.4.6
 %define patchversion 6.4
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.4.4
+%define tarfile_release 6.4.6
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 200%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.4.4
+%define kabiversion 6.4.6

 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@ -1785,7 +1785,7 @@ rm -f localversion-next
 # *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python. Change it to python3 (or python2) explicitly.
 # We patch all sources below for which we got a report/error.
 echo "Fixing Python shebangs..."
-pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
+%py3_shebang_fix \
 	tools/kvm/kvm_stat/kvm_stat \
 	scripts/show_delta \
 	scripts/diffconfig \
@ -3740,6 +3740,11 @@ fi\
 #
 #
 %changelog
+* Mon Jul 24 2023 Augusto Caringi <acaringi@redhat.com> [6.4.6-0]
+- Change pathfix.py to %%py3_shebang_fix (Justin M. Forbes)
+- Add config option coming to a stable update soon (Justin M. Forbes)
+- Linux v6.4.6
+
 * Wed Jul 19 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.4.4-0]
 - move ownership of /lib/modules/<ver>/ to kernel-core (Thorsten Leemhuis)
 - Let kernel-modules-core own the files depmod generates. (Thorsten Leemhuis)
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@ -39,7 +39,7 @@
 38 files changed, 498 insertions(+), 179 deletions(-)

 diff --git a/Makefile b/Makefile
-index d5041f7daf68..040d61eb5fe5 100644
+index 23ddaa3f3034..1ca016223132 100644
 --- a/Makefile
 +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -93,10 +93,10 @@ index 9ed7f03ba15a..9f5972a2d17b 100644
 	  The VM uses one page of physical memory for each page table.
 	  For systems with a lot of processes, this can use a lot of
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 92f3fff2522b..eda3f7dfc558 100644
+index b2326674b4d3..375bae9b1708 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -1269,7 +1269,7 @@ endchoice
+@@ -1288,7 +1288,7 @@ endchoice

 config ARM64_FORCE_52BIT
 	bool "Force 52-bit virtual addresses for userspace"
@ -994,10 +994,10 @@ index f1dcfa3f1a1b..62fa35de72ac 100644
  * Changes the default domain of an iommu group
  *
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index c525867760bf..549083cdf0ec 100644
+index b7c65193e786..fd55846ced2b 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4309,6 +4309,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4311,6 +4311,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
 				quirk_bridge_cavm_thrx2_pcie_root);

--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.4.4.tar.xz) = 290393bceff167900093b9df4c39850f21ff40833873ec737bd5e397d848f014fa7ae7000d95cf2e44eb65fda7ecf54d32f8dd518c3480995755f3e5d7364931
-SHA512 (kernel-abi-stablelists-6.4.4.tar.bz2) = 86287651c8f7cebc0322c260e9c75a8828456cf26115b21247b4e681f652e0de2e5ea0f76c26545cc8a43c8b22216ff7ff7397209c14b70e2001ce149cf93425
-SHA512 (kernel-kabi-dw-6.4.4.tar.bz2) = 171f2027afd9d7a01c4b55453be9f6053687b4286cfa512b665f67c6d0682c8f51e74a2018fd68e1ae7144a60207c67c4b4b17705821107df98831d5160e6f09
+SHA512 (linux-6.4.6.tar.xz) = b5f54c6ce93e09c51cc42aa9467924ca0aa0c2861061d6cb09336e044773e29cd1780eddb2fb07e3cd61f84964665ac9a04dbbae7268801affea67e7dcbdbb06
+SHA512 (kernel-abi-stablelists-6.4.6.tar.bz2) = acd8f4a52dd0c8f86706ccfbfe120c6cabbf0fadfa4e08ef492d287da0a54d3c5af8f0d850e8a376f2cbe96b40f5cf4645b32e7d0d5f6405547059a1e5d53547
+SHA512 (kernel-kabi-dw-6.4.6.tar.bz2) = 506b27ee49a0bb2521e54f3822ad60e5e4b9f02b79f3fa2dcdcd2bdd0733be6785b710042d3487896249fd0f9beb5369060d61a042ac916cba4e350b1321c009