summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-04-16 11:56:28 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-04-16 11:56:28 +0200
commit2d0580aa8ef195a79de178ce0abacedcb09e0827 (patch)
treec412614780a29ef88737ae3ee1e9009e546b9087 /kernel.spec
parente8a2aa2614cda7cb7c38c350fac68d8b29395fa3 (diff)
parent08df0d04417f82c0545bd474c58aa75981d428c7 (diff)
downloadkernel-2d0580aa8ef195a79de178ce0abacedcb09e0827.tar.gz
kernel-2d0580aa8ef195a79de178ce0abacedcb09e0827.tar.xz
kernel-2d0580aa8ef195a79de178ce0abacedcb09e0827.zip
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index def5cce42..84f4b2426 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2771,7 +2771,10 @@ fi
#
#
%changelog
-* Sat Apr 10 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.13-300]
+* Wed Apr 14 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.14-0]
+- Quick hack to reset release to 0 (Justin M. Forbes)
+- Add clarity to rebase notes since that change was backed out (Justin M. Forbes)
+- drm/i915/gen11+: Only load DRAM information from pcode (José Roberto de Souza)
- Add CONFIG_NVIDIA_CARMEL_CNP_ERRATUM to RHEL configs too (Justin M. Forbes)
- Add config for CONFIG_NVIDIA_CARMEL_CNP_ERRATUM (Justin M. Forbes)