summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec3
1 files changed, 3 insertions, 0 deletions
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 <jforbes@fedoraproject.org> [5.12.0-0.rc1.162]
+- Fix merge issue (Justin M. Forbes)
+
* Sat Feb 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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)