From 51aea159355a5cbfab3df1ad553d6a45728c77f0 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 1 Mar 2021 10:48:49 -0600 Subject: kernel-5.12.0-0.rc1.162 * Mon Mar 01 2021 Justin M. Forbes [5.12.0-0.rc1.162] - Fix merge issue (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 3 +++ patch-5.12.0-redhat.patch | 4 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 15ab6f9c9..465819eda 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/a512e1bf45d5712e94fb3aa47e20b7578dad0373 + a512e1bf45d5712e94fb3aa47e20b7578dad0373 Fix merge issue + https://gitlab.com/cki-project/kernel-ark/-/commit/06219afd635737bfee1a7c676258e66448f133e2 06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option diff --git a/kernel.spec b/kernel.spec index 9066f2d79..2e7967836 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2762,6 +2762,9 @@ fi # # %changelog +* Mon Mar 01 2021 Justin M. Forbes [5.12.0-0.rc1.162] +- Fix merge issue (Justin M. Forbes) + * Sat Feb 27 2021 Fedora Kernel Team [5.12.0-0.rc0.20210227gitc03c21ba6f4e.161] - Change the pending config for CONFIG_PPC_QUEUED_SPINLOCKS as it is now default upstream for 64-bit server CPUs (Justin M. Forbes) - Turn on CONFIG_PPC_QUEUED_SPINLOCKS as it is default upstream now (Justin M. Forbes) diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 42bf396f8..40de102c9 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -201,7 +201,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index f9b54da2fca0..77582ee9b1a3 100644 +index f9b54da2fca0..e2333c46d848 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -228,7 +228,7 @@ index f9b54da2fca0..77582ee9b1a3 100644 echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ - echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) -+ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) \ ++ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \ + echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \ + echo '#define RHEL_MINOR $(RHEL_MINOR)'; \ + echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \ diff --git a/sources b/sources index 5c5743501..81a643e30 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.12-rc1.tar.xz) = 961e13dc2102ffbe50c9ee2d0c42a24b8345a13fe150dc95e1cade43f47c56773d9eb9b5c975a28190a545f1a241d4636e3f35aad8e3cef8bcd5643b30bd2570 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc1.162.tar.bz2) = 24684129ca3785fe4931af28ef2121455dbefc8e85eaaffa114d97cf6bb5988bcc178e02a8ee3784dd82ed2c0de3c09132a72ae4efd0ca22f9485f12fd1aec4d +SHA512 (kernel-abi-whitelists-5.12.0-0.rc1.162.tar.bz2) = 6a890bf24b520687e199b9e214d723193f79ce86863c4576fe1e4094237cf62a46ed9ea7237f2a4065b8dc2c6392eda16e32dfa052a4c39aa854e58d02fb1c6c SHA512 (kernel-kabi-dw-5.12.0-0.rc1.162.tar.bz2) = 102da40de3a35ae1fa08c7f16454da04cac3ba6887c05a7ea792b105a996d48878d7ad022c68e55d36f7d71815f21255e871588ad2e3d876b0409ff990b327aa -- cgit