diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-21 16:54:22 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-21 16:54:22 +0100 |
commit | 8fc61f124d50c9b7359898c2d1365eb50f21ced3 (patch) | |
tree | ce9bb085594ca79e0bf8edacb0934dc401834783 /kernel.spec | |
parent | 424d383ff882e4473c32a374574afe36ae8e855d (diff) | |
parent | 4f1980456ed199c0ea6aaea5ff907f98471df4d6 (diff) | |
download | kernel-8fc61f124d50c9b7359898c2d1365eb50f21ced3.tar.gz kernel-8fc61f124d50c9b7359898c2d1365eb50f21ced3.tar.xz kernel-8fc61f124d50c9b7359898c2d1365eb50f21ced3.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc2.git3.1.vanilla.knurd.1.fc33kernel-5.6.0-0.rc2.git3.1.vanilla.knurd.1.fc32kernel-5.6.0-0.rc2.git3.1.vanilla.knurd.1.fc31kernel-5.6.0-0.rc2.git3.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index b316cd796..90441f786 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 1 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -885,6 +885,11 @@ 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 +Patch531: 0001-mm-Avoid-creating-virtual-address-aliases-in-brk-mma.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1804330 +Patch532: 0001-include-uapi-Fix-invalid-use-of-BITS_PER_LONG-in-__s.patch + # END OF PATCH DEFINITIONS %endif @@ -2917,6 +2922,15 @@ fi # # %changelog +* Fri Feb 21 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc2.git3.1 +- Linux v5.6-rc2-55-gca7e1fd1026c + +* Wed Feb 19 2020 Jeremy Cline <jcline@redhat.com> +- Pick up a uapi fix for qemu (rhbz 1804330) + +* Wed Feb 19 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc2.git2.1 +- Linux v5.6-rc2-47-g4b205766d8fc + * Tue Feb 18 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc2.git1.1 - Linux v5.6-rc2-8-gb1da3acc781c - Enable CONFIG_INET_ESPINTCP (rhbz 1804255) |