diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-13 19:35:30 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-13 19:35:30 +0100 |
commit | 2342b3fc5eb85550db82da6c889e94798ba3b161 (patch) | |
tree | 35f2438bb3eac15c327c20c5d019112407657011 /kernel.spec | |
parent | 5f6f3129546b2ef22a4aede439b4e4140a7b4d0b (diff) | |
parent | caf831c1b1881da2f95eda74e84052450fa9a489 (diff) | |
download | kernel-2342b3fc5eb85550db82da6c889e94798ba3b161.tar.gz kernel-2342b3fc5eb85550db82da6c889e94798ba3b161.tar.xz kernel-2342b3fc5eb85550db82da6c889e94798ba3b161.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc33kernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc32kernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc31kernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc30
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 2a13d544d..926f253d3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -881,6 +881,8 @@ Patch527: alsa-5.6.patch Patch529: 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch +Patch530: 0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch + # END OF PATCH DEFINITIONS %endif @@ -2913,6 +2915,12 @@ fi # # %changelog +* Thu Feb 13 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git2.1 +- Linux v5.6-rc1-23-g0bf999f9c5e7 + +* Thu Feb 13 2020 Jeremy Cline <jcline@redhat.com> +- Pull in cdrom ioctl fix (rhbz 1801353) + * Tue Feb 11 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git1.1 - Linux v5.6-rc1-5-g0a679e13ea30 |