diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-28 13:43:14 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-28 13:43:14 +0200 |
| commit | 51a837f67619793eff3bf845d941ae29b7285054 (patch) | |
| tree | 3bdae76aecbf45ab5b60c7d2250e84de7c479f72 /kernel.spec | |
| parent | 41289550704f221db0821e34ebe2f5876c30821f (diff) | |
| parent | 800874a6476b2dde2e8875f51337eea25169ce2f (diff) | |
| download | kernel-51a837f67619793eff3bf845d941ae29b7285054.tar.gz kernel-51a837f67619793eff3bf845d941ae29b7285054.tar.xz kernel-51a837f67619793eff3bf845d941ae29b7285054.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 666df66cd..00d5d137e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2797,6 +2797,10 @@ fi # # %changelog +* Wed May 26 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.7-0] +- Fix up merge issue resulting in dual entries for ALC295_FIXUP_ASUS_DACS (Justin M. Forbes) +- powerpc/64s/syscall: Fix ptrace syscall info with scv syscalls (Nicholas Piggin) + * Sat May 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.6-0] - bus: mhi: core: Download AMSS image from appropriate function (Bhaumik Bhatt) |