diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-06 06:44:10 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-06 06:44:10 +0100 |
| commit | 089be17ad0be72232ea0ebaa648d7700214183e2 (patch) | |
| tree | dcd5a7678c95d4afe6e040f4775fd65f8a41d288 | |
| parent | 890940ffffa2c876128c33595ecffdf4ea6b4ccf (diff) | |
| parent | f189591a7f11d1252e69fc7c7f6fb22ee6a8c6a0 (diff) | |
| download | kernel-089be17ad0be72232ea0ebaa648d7700214183e2.tar.gz kernel-089be17ad0be72232ea0ebaa648d7700214183e2.tar.xz kernel-089be17ad0be72232ea0ebaa648d7700214183e2.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 4 | ||||
| -rw-r--r-- | patch-5.16-redhat.patch | 2 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 11 insertions, 4 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 9c34c72cd..991cf4ce4 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2991,6 +2991,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)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-5.16.5.tar.xz) = cefe57f06f04863406a3f9bdb17a7ae41fda85e6e2f602f60942151708a91b3edb05aa7bb37b2bd41c0a5664d36e7de146edb8b217a3d1ac8643f824e9790a3e -SHA512 (kernel-abi-stablelists-5.16.5-200.tar.bz2) = d0abea67b134981ef57574fe643aacf84a375fbffff75aa080c4b4632c9ac2003977717c68e987effe8eec8c4d1cf876afb5476df46e543e0b71e94f237e86e8 -SHA512 (kernel-kabi-dw-5.16.5-200.tar.bz2) = 5261c042bc0c3ced51ccfcbd7208557d606c2987f9607b8809d21b041202ac3d71003cfa014afc149247adaf64010ba32f7cc6fac25cfeed7d7363981f83cf26 +SHA512 (linux-5.16.6.tar.xz) = 01649f19da276439b8c99968c4bb3a4c0a932803406a4d4ff9b375d86afa12531e23f5368a5edea707c6d80d6c92ab5da26889d445b6e4f6f37b0e7b96cb6cc1 +SHA512 (kernel-abi-stablelists-5.16.6-200.tar.bz2) = 4a08e4e86b4151b5ffd46e5471e40a1d53d65f9857b349a333895bd4144d0f9c67f5d6a1f11427bd8b2f4093dd692d3bc007b655f2f7848f4274e9f1bd571f37 +SHA512 (kernel-kabi-dw-5.16.6-200.tar.bz2) = 163c19cd30b8a397b9baab4f3073ac6517a414ffe7b6f3e1ed96c97bd6b91a68fa65cc6fbcbff3a8209bed54b2223f678a3e5dc390626d76117877c1f266b68c |