diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-28 13:43:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-28 13:43:16 +0200 |
| commit | 93f0722a8b31c79da8a4e9840f644969099ecdd5 (patch) | |
| tree | 8096c91fc0914b32b5ac7d40dd173718b8735da4 /kernel.spec | |
| parent | 18e541e2d8346835962e39d5a3f66c5c3ff485f9 (diff) | |
| parent | af1b203d794eb5fdf9eee1dfb1c93b2ad43a9263 (diff) | |
| download | kernel-93f0722a8b31c79da8a4e9840f644969099ecdd5.tar.gz kernel-93f0722a8b31c79da8a4e9840f644969099ecdd5.tar.xz kernel-93f0722a8b31c79da8a4e9840f644969099ecdd5.zip | |
Merge remote-tracking branch 'origin/f33' into f33-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 3cd5e3625..fe5bfaa53 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) |