diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-06 08:31:42 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-06 08:31:42 +0200 |
| commit | 603ff822c314c4f2ac70602e1362b1f89d2ef06c (patch) | |
| tree | f7126c873194a484b2c885350f0da1fbe7989f5f /kernel.spec | |
| parent | 8f5a232a5e9dd1816ddd83e7257f942841944f78 (diff) | |
| parent | dc16ce7d36f111450d683d352f78257338a98135 (diff) | |
| download | kernel-603ff822c314c4f2ac70602e1362b1f89d2ef06c.tar.gz kernel-603ff822c314c4f2ac70602e1362b1f89d2ef06c.tar.xz kernel-603ff822c314c4f2ac70602e1362b1f89d2ef06c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc0.git2.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc0.git2.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc0.git2.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 7e4daeb4c..1aa1d2479 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -634,10 +634,6 @@ Patch501: Fix-for-module-sig-verification.patch # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# rbhz 1435837 -# https://www.spinics.net/lists/linux-acpi/msg82405.html -Patch504: mailbox-ACPI-erroneous-error-message-when-parsing-ACPI.patch - # END OF PATCH DEFINITIONS %endif @@ -1876,6 +1872,12 @@ fi # # %changelog +* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org> +- Enable CONFIG_SCSI_DH on s390x (rhbz 1586189) + +* Tue Jun 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git2.1 +- Linux v4.17-1535-g5037be168f0e + * Mon Jun 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git1.1 - Linux v4.17-505-g9214407d1237 |