summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-09-08 12:03:09 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-09-08 12:03:09 +0200
commit392c565051d26111e44cf4d4d66176e8a215d2b1 (patch)
tree2584c50452d85f5d3413eef1cb42ca68a81dad77
parentf582e9ee7fbbc5577b0dcd0c1d3a6a399151e640 (diff)
parent0fbdbf7c90060f5c7e33378653ef671464700210 (diff)
downloadkernel-392c565051d26111e44cf4d4d66176e8a215d2b1.tar.gz
kernel-392c565051d26111e44cf4d4d66176e8a215d2b1.tar.xz
kernel-392c565051d26111e44cf4d4d66176e8a215d2b1.zip
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
-rw-r--r--kernel-aarch64-debug-fedora.config1
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-fedora.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rwxr-xr-xkernel.spec6
-rw-r--r--patch-5.19-redhat.patch8
-rw-r--r--sources6
7 files changed, 16 insertions, 8 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 43246be10..be418f392 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_824069=y
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 671aa1c97..818866473 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -294,6 +294,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_824069=y
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index ba8d42a13..dc74d3206 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_824069=y
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 118facb98..5f6794c0b 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -294,6 +294,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_824069=y
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/kernel.spec b/kernel.spec
index f26c85550..96c462713 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -136,7 +136,7 @@ Summary: The Linux kernel
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 150%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 5.19.6
+%define kabiversion 5.19.7
#
# End of genspec.sh variables
@@ -3144,6 +3144,10 @@ fi
#
#
%changelog
+* Mon Sep 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.7-0]
+- New config item for 5.19.7 (Justin M. Forbes)
+- Linux v5.19.7
+
* Wed Aug 31 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.6-0]
- Revert "block: freeze the queue earlier in del_gendisk" (Justin M. Forbes)
- redhat/configs: aarch64: Turn on Apple Silicon configs for Fedora (Eric Curtin)
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index f5d5aee6a..a66680639 100644
--- a/patch-5.19-redhat.patch
+++ b/patch-5.19-redhat.patch
@@ -251,7 +251,7 @@ index 000000000000..733a26bd887a
+
+endmenu
diff --git a/Makefile b/Makefile
-index cb68101ea070..da893ccb2025 100644
+index 3d88923df694..4f4e240c3d2b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -370,10 +370,10 @@ index ce9826bce29b..948d18e59cf5 100644
CONFIG_DRM_ETNAVIV=m
CONFIG_DRM_MXSFB=m
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index a5d1b561ed53..cd93c9041679 100644
+index 001eaba5a6b4..cc20aaacd741 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -1145,7 +1145,7 @@ endchoice
+@@ -1162,7 +1162,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -382,7 +382,7 @@ index a5d1b561ed53..cd93c9041679 100644
help
For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs
-@@ -1384,6 +1384,7 @@ config XEN
+@@ -1401,6 +1401,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
diff --git a/sources b/sources
index f7f538d36..c68e8c101 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.19.6.tar.xz) = d3303075a41dcb34454420b6c46fa73d8a9724e730a1bcd45f2437094e53629db228e049032c694ee85e6d718158dc9df31cfa8ef927c4a6390dccd181c0a3cf
-SHA512 (kernel-abi-stablelists-5.19.6.tar.bz2) = 0073d5bbc08c9b2cc3afba9747f02b42a2f9ad6b173fa4e52a4c83e602dfabfd2c30e27374e55fd09bbae713433b54af3470d405aeb0b28a0c78204afa3c89d4
-SHA512 (kernel-kabi-dw-5.19.6.tar.bz2) = 144ad5931c9be1a9b3207ac8895a53844b7e734ab2d92eea6c987432f9f08a4480287a6f01398d0f14d6e9416a98af316589a641d7ab9ee7bda0d49fc7dadc4f
+SHA512 (linux-5.19.7.tar.xz) = 7803b9ca5f6aed239ae8d99b341ea4f1e1e0db824965818535375a1f5c46aad32ca2ae256ec98a03148b1625e5212de983cbecd27c36d0f2a9aa5fb5704b8d8f
+SHA512 (kernel-abi-stablelists-5.19.7.tar.bz2) = 1e1f4dd5f32a88d8cbc08d5660b01243305092f9f62ccb5ed625bcf8116376aac21ac15dde3b741c571b198368d9920c9f1d587783a3397c58bc8a6fa648ef20
+SHA512 (kernel-kabi-dw-5.19.7.tar.bz2) = 74228e279df8db7eb8a44f7e236a4e1ddcec268bd134715a4d86f3c6b4841debb624bbdb60ee49567355a57ca84cd66d3647e79e15249f8f6f6a393b751359a9