summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-11-03 06:41:13 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-11-03 06:41:13 +0100
commit58800b38a0cb18a69864886a90d6a4a3c8df33a7 (patch)
treeac24db948564c8ed450b373e611f0fbf41f2b7ef
parentdbf0806836501a73c85b26b585005a3a27d04c5a (diff)
parent514c74c7e3f25d6d778f1b074cd74383fd8e8fc9 (diff)
downloadkernel-58800b38a0cb18a69864886a90d6a4a3c8df33a7.tar.gz
kernel-58800b38a0cb18a69864886a90d6a4a3c8df33a7.tar.xz
kernel-58800b38a0cb18a69864886a90d6a4a3c8df33a7.zip
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rwxr-xr-xkernel.spec5
-rw-r--r--sources6
4 files changed, 7 insertions, 6 deletions
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index c8dd1a9f5..274b439c7 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4407,7 +4407,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
# CONFIG_QCOM_QFPROM is not set
# CONFIG_QCOM_RMTFS_MEM is not set
# CONFIG_QCOM_RPMH is not set
-CONFIG_QCOM_SCM=y
# CONFIG_QCOM_SMEM is not set
# CONFIG_QCOM_SPMI_IADC is not set
# CONFIG_QCOM_SPMI_VADC is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index ed9a9400a..3ef66f4fc 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4386,7 +4386,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
# CONFIG_QCOM_QFPROM is not set
# CONFIG_QCOM_RMTFS_MEM is not set
# CONFIG_QCOM_RPMH is not set
-CONFIG_QCOM_SCM=y
# CONFIG_QCOM_SMEM is not set
# CONFIG_QCOM_SPMI_IADC is not set
# CONFIG_QCOM_SPMI_VADC is not set
diff --git a/kernel.spec b/kernel.spec
index 7ee0a3abf..3c28c393e 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2963,7 +2963,10 @@ fi
#
#
%changelog
-* Wed Oct 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.15-300]
+* Tue Nov 02 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.16-0]
+- Changelog entry for 5.14.15 (Justin M. Forbes)
+
+* Wed Oct 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.15-0]
- Linux v5.14.15
* Wed Oct 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.14-0]
diff --git a/sources b/sources
index e45e63561..917b86532 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.15.tar.xz) = 3e1128a8a26ac3935b591515120e44222f0f127767d1420f636c50c8ce51da28b78dbc9adfcce2588bf7059088f542a29bd4b9d98b90c543a2f42b6dff232288
-SHA512 (kernel-abi-stablelists-5.14.15-300.tar.bz2) = 6a47bc900ddf14be5c9edefc2dcc002adfaa42ac86799098aa497e177e5adbc525450efffc59e5d348bcc6e419c12e33afbd4757fd58de9021853c010b8ba154
-SHA512 (kernel-kabi-dw-5.14.15-300.tar.bz2) = c68855132b072ab6d738e3b53255c2745650f80c07f80c0e5101b0d8965db3789865eb038c91434894c25d595e4e38a56d8f6b57708600e0a043d7619ea9ad7d
+SHA512 (linux-5.14.16.tar.xz) = f4b84337b98423c41f6b910151d03215a9d38dcc81688d615dea83e63b60c65dc376e335c8d40966a3d5f7b0ef4ec58444894aacaea55ea99b62f328c0f205d3
+SHA512 (kernel-abi-stablelists-5.14.16-300.tar.bz2) = 55a6a0715657f4eefa6a995e17070746e2f0092ae405cb0a6307f5afb008e5e830e60e9d5de55f8c89833f21c23c8fef29374a5d1643612e12e360d355427b7a
+SHA512 (kernel-kabi-dw-5.14.16-300.tar.bz2) = 6d3435e20d5757c5f652c1b62e8b6a99a1194ebe4d53277b8cfde9112c458d88e7957db1ccfa1735c04370067c0733840119ae675ce47710d10163370bc4463b