summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-02-05 11:05:24 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-02-05 11:05:24 -0600
commit79d04980dd2502af28c3172a03411c03038b146c (patch)
tree5de5085ea1df0fd0c3f7a9e667ab989544284b28
parent3d29992864aa43ff9d5e58f2f4f564811337f009 (diff)
downloadkernel-79d04980dd2502af28c3172a03411c03038b146c.tar.gz
kernel-79d04980dd2502af28c3172a03411c03038b146c.tar.xz
kernel-79d04980dd2502af28c3172a03411c03038b146c.zip
kernel-5.16.6-0
* Sat Feb 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.6-0] - Revert "ath11k: add support for WCN6855 hw2.1" (Justin M. Forbes) - Changelog updates for rebase (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Patchlist.changelog3
-rwxr-xr-xkernel.spec12
-rw-r--r--patch-5.16-redhat.patch2
-rw-r--r--sources6
4 files changed, 15 insertions, 8 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog
index ab06ca655..8ca6c1ebe 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/78d32feef05fdbc59daccda9b8b1cacf872a95ba
+ 78d32feef05fdbc59daccda9b8b1cacf872a95ba Revert "ath11k: add support for WCN6855 hw2.1"
+
https://gitlab.com/cki-project/kernel-ark/-/commit/cb99932837e78b1f5fd6b1befaf547022225baee
cb99932837e78b1f5fd6b1befaf547022225baee ath11k: add support for WCN6855 hw2.1
diff --git a/kernel.spec b/kernel.spec
index a3d039bfd..b0ad2ce0d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.5
+%define rpmversion 5.16.6
%define patchversion 5.16
%define pkgrelease 100
@@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.5.tar.xz
+Source0: linux-5.16.6.tar.xz
Source1: Makefile.rhelver
@@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.5 -c
-mv linux-5.16.5 linux-%{KVERREL}
+%setup -q -n kernel-5.16.6 -c
+mv linux-5.16.6 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2986,6 +2986,10 @@ fi
#
#
%changelog
+* Sat Feb 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.6-0]
+- Revert "ath11k: add support for WCN6855 hw2.1" (Justin M. Forbes)
+- Changelog updates for rebase (Justin M. Forbes)
+
* Tue Feb 01 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.5-0]
- Linux v5.16.5 rebase
- ath11k: add support for WCN6855 hw2.1 (Baochen Qiang)
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index e0a88e2b5..948835889 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -45,7 +45,7 @@
44 files changed, 746 insertions(+), 191 deletions(-)
diff --git a/Makefile b/Makefile
-index 2f0e5c3d9e2a..d71b7646e438 100644
+index 2d7b7fe5cbad..52e21618ca2c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index ed385be9c..12a6d2fc2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16.5.tar.xz) = cefe57f06f04863406a3f9bdb17a7ae41fda85e6e2f602f60942151708a91b3edb05aa7bb37b2bd41c0a5664d36e7de146edb8b217a3d1ac8643f824e9790a3e
-SHA512 (kernel-abi-stablelists-5.16.5-100.tar.bz2) = db5985fbd4edcf0d7b97c47f79121690d2e9a156d071fa5c030cada2f800b890ce5b021623826867edc8485969dd78f0657ab81f8099639e546ee2b2b0fde726
-SHA512 (kernel-kabi-dw-5.16.5-100.tar.bz2) = 5261c042bc0c3ced51ccfcbd7208557d606c2987f9607b8809d21b041202ac3d71003cfa014afc149247adaf64010ba32f7cc6fac25cfeed7d7363981f83cf26
+SHA512 (linux-5.16.6.tar.xz) = 01649f19da276439b8c99968c4bb3a4c0a932803406a4d4ff9b375d86afa12531e23f5368a5edea707c6d80d6c92ab5da26889d445b6e4f6f37b0e7b96cb6cc1
+SHA512 (kernel-abi-stablelists-5.16.6-100.tar.bz2) = 3ce8616f6709bb14d0dbff3b62d5dcff812b1f2d8024385a77d30f9ec0b1690719a3cc63032a3e701746ef201b5ea3def585db27795dac965288d6c8d90fc242
+SHA512 (kernel-kabi-dw-5.16.6-100.tar.bz2) = 163c19cd30b8a397b9baab4f3073ac6517a414ffe7b6f3e1ed96c97bd6b91a68fa65cc6fbcbff3a8209bed54b2223f678a3e5dc390626d76117877c1f266b68c