diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-30 07:13:56 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-30 07:13:56 +0100 |
commit | 59f69805fafafad8f2fc403ec696f4e1790496df (patch) | |
tree | 03ed90acd3ab904b12058b44418be825283f02f0 /kernel.spec | |
parent | 8bb91cf4c77714ad0903c65859deb7ba1d652106 (diff) | |
parent | 677dc70b60fa4d9603bdf605c716da4388c024b5 (diff) | |
download | kernel-59f69805fafafad8f2fc403ec696f4e1790496df.tar.gz kernel-59f69805fafafad8f2fc403ec696f4e1790496df.tar.xz kernel-59f69805fafafad8f2fc403ec696f4e1790496df.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc2.git4.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc2.git4.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc2.git4.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc2.git4.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 884ed211d..050adb343 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -608,6 +608,9 @@ Patch508: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch # rhbz 1688283 Patch512: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch +# https://patchwork.kernel.org/patch/10872997/ +Patch513: Correct-zone-boundary-handling-when-resetting-pageblock-skip-hints.patch + # END OF PATCH DEFINITIONS %endif @@ -1884,6 +1887,10 @@ fi # # %changelog +* Fri Mar 29 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc2.git4.1 +- Linux v5.1-rc2-247-g9936328b41ce +- Pick up a mm fix causing hangs (rhbz 1693525) + * Thu Mar 28 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc2.git3.1 - Linux v5.1-rc2-243-g8c7ae38d1ce1 |