diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-07 11:20:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-07 11:20:11 +0200 |
commit | fa976cc0a786360149903c57361aa510e5d5a0f7 (patch) | |
tree | 98fb30e4a6f191654db38e1b6e0405bce540b201 /kernel.spec | |
parent | ada9d4d931c0aeac85d7b79167ee86ca32a3c197 (diff) | |
parent | 4a0e1984f812c042c2a4af4d69bebc87a427811a (diff) | |
download | kernel-fa976cc0a786360149903c57361aa510e5d5a0f7.tar.gz kernel-fa976cc0a786360149903c57361aa510e5d5a0f7.tar.xz kernel-fa976cc0a786360149903c57361aa510e5d5a0f7.zip |
Merge remote-tracking branch 'origin/f33' into f33-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 d8ec6f865..ca5d9b1ce 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-200] +- 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) |