summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-09-28 11:13:50 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-09-28 11:13:50 +0200
commit046a81a4a8d28cd043b6d38eec13f56698380524 (patch)
tree9d6f0b14a5254df9643a9f5487415d8413ea1a1b
parentd8949abf82dc735174e2561c1679bc04beebc802 (diff)
parentd57ec803b4b41ea8c6471f1ed0303e296c2290c8 (diff)
downloadkernel-046a81a4a8d28cd043b6d38eec13f56698380524.tar.gz
kernel-046a81a4a8d28cd043b6d38eec13f56698380524.tar.xz
kernel-046a81a4a8d28cd043b6d38eec13f56698380524.zip
Merge remote-tracking branch 'origin/f37' into f37-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
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rwxr-xr-xkernel.spec5
-rw-r--r--patch-5.19-redhat.patch2
-rw-r--r--sources6
11 files changed, 12 insertions, 9 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c5ab64e19..881b3fff8 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -398,6 +398,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS=48
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 0221f800c..7ea33c155 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -322,6 +322,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 5bf8fa6f0..7805ca590 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -398,6 +398,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS=48
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 7a87bf321..2dd4d52ac 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -322,6 +322,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 35b7035d1..714547649 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -349,7 +349,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
CONFIG_ARCH_ZYNQ=y
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 110a731ac..b0f61280b 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -349,7 +349,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
CONFIG_ARCH_ZYNQ=y
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index ace435e5c..dbadde63d 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -341,7 +341,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index a10f29a2c..135db7315 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -341,7 +341,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/kernel.spec b/kernel.spec
index c162d3de9..3866f6120 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 350%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 5.19.10
+%define kabiversion 5.19.11
#
# End of genspec.sh variables
@@ -3148,6 +3148,9 @@ fi
#
#
%changelog
+* Fri Sep 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.11-0]
+- Linux v5.19.11
+
* Tue Sep 20 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.10-0]
- kbuild: Add skip_encoding_btf_enum64 option to pahole (Martin Rodriguez Reboredo)
- Linux v5.19.10
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index 1472d6f5b..80e5938ef 100644
--- a/patch-5.19-redhat.patch
+++ b/patch-5.19-redhat.patch
@@ -254,7 +254,7 @@ index 000000000000..733a26bd887a
+
+endmenu
diff --git a/Makefile b/Makefile
-index 33a9b6b547c4..f16045bf3888 100644
+index 01463a22926d..2cb088d25213 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 4b45df98e..83b5007b1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.19.10.tar.xz) = 13979541c993284eaf1db132a238bae26d2f6adb30fd42382f49e028e662dce57e784784a7af00cd46acc8ec1f4d9612ea542e43ebfcd8bd20267ba7800ac5b5
-SHA512 (kernel-abi-stablelists-5.19.10.tar.bz2) = fc97ba591f75079dc0cfebaf46c6f000a6d7c22adf2972747626e4e7da5e95df91017b97d06fcbb08c5c9d21b3bba0cb314aa67e40a66821b2bfada59b5208e6
-SHA512 (kernel-kabi-dw-5.19.10.tar.bz2) = 132bbbd4460005544a5e357895d9b6eaa50c98646dba4253feb05881dfd9f66dcf533b25b5264c7bdd3bb5d920f539a4b9180564eb3579665ab38caf88d99fb2
+SHA512 (linux-5.19.11.tar.xz) = d6d103a580fac71a0d2e99aed5096f8afc276b18e850689b2636c7e0c21810decf2a4f0f0a5f728731f7d8f940d103f157e303190225b8984fa04f266f2e5cd0
+SHA512 (kernel-abi-stablelists-5.19.11.tar.bz2) = 393f8d5e76358c1173a8f2009ab6d29538e79242670f61b9117dd6ed8ee248f90ce0e2e22bc5d04c6f4964fbffd43af4be43c8f271fd9cf40ee5352ffa84026b
+SHA512 (kernel-kabi-dw-5.19.11.tar.bz2) = 7924808283251f433eaf59b2125f79627d3bf2a96a231b67ae9eba159287c7300be8e4bf3d622b461fe20b429176a6b4fbae29940c92cc17cd5fea3a2de46c23