diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-07 11:19:49 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-07 11:19:49 +0200 |
commit | bfff8f9cefe8b70c1cbded5decff1cfa933c7d29 (patch) | |
tree | 43c88a5cd95c8a43a75f9a4ce683f3330efe6acc /kernel.spec | |
parent | 6dcf207f45d7022a4fb39f3386fcdefba1a8b01e (diff) | |
parent | db5f416f964c451e5b23ad8082df6840ebeaa229 (diff) | |
download | kernel-bfff8f9cefe8b70c1cbded5decff1cfa933c7d29.tar.gz kernel-bfff8f9cefe8b70c1cbded5decff1cfa933c7d29.tar.xz kernel-bfff8f9cefe8b70c1cbded5decff1cfa933c7d29.zip |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 40b0fcb73..3ade5f03f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2420,7 +2420,7 @@ if [ -f /etc/sysconfig/kernel ]\ then\ . /etc/sysconfig/kernel || exit $?\ fi\ -if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink -a ! -e /run/ostree-booted ] \ +if [ "$HARDLINK" != "no" -a -x /usr/bin/hardlink -a ! -e /run/ostree-booted ] \ then\ (cd /usr/src/kernels/%{KVERREL}%{?1:+%{1}} &&\ /usr/bin/find . -type f | while read f; do\ @@ -2771,6 +2771,16 @@ fi # # %changelog +* Mon May 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.18-300] +- nitro_enclaves: Fix stale file descriptors on failed usercopy (Mathias Krause) + +* Mon May 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.18-0] +- Enable mtdram for fedora (rhbz 1955916) (Justin M. Forbes) +- hardlink is in /usr/bin/ (rhbz 1889043) (Justin M. Forbes) +- sfc: ef10: fix TX queue lookup in TX event handling (Edward Cree) +- sfc: farch: fix TX queue lookup in TX event handling (Edward Cree) +- sfc: farch: fix TX queue lookup in TX flush done handling (Edward Cree) + * Wed Apr 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.17-0] - Fedora: ARMv7: build for 16 CPUs. (Peter Robinson) |