diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-05 18:55:39 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-05 18:55:39 +0100 |
| commit | 0120fefbc532ff27cbd63d177dbb048bd3e3890e (patch) | |
| tree | 65fc0cefba40900a3ad52a13c60b9fc455579958 /kernel.spec | |
| parent | a5ded53d437594d2f9eef501217886a45485a128 (diff) | |
| parent | 2be352ba91dab44bf6d06087469c27048b765929 (diff) | |
| download | kernel-0120fefbc532ff27cbd63d177dbb048bd3e3890e.tar.gz kernel-0120fefbc532ff27cbd63d177dbb048bd3e3890e.tar.xz kernel-0120fefbc532ff27cbd63d177dbb048bd3e3890e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc0.git3.1.vanilla.knurd.2.fc32kernel-5.6.0-0.rc0.git3.1.vanilla.knurd.2.fc31kernel-5.6.0-0.rc0.git3.1.vanilla.knurd.2.fc30
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 72896d7fe..34f793155 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -880,6 +880,8 @@ Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch # ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support) Patch527: alsa-5.6.patch +Patch529: 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch + # END OF PATCH DEFINITIONS %endif @@ -2912,6 +2914,9 @@ fi # # %changelog +* Wed Feb 05 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc0.git3.1 +- Linux v5.5-9402-g6992ca0dd017 + * Sat Feb 01 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc0.git2.1 - Linux v5.5-8686-g14cd0bd04907 |