diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-05-26 06:20:22 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-05-26 06:20:22 +0200 |
| commit | 87edb2e55d509ad15181de5e5401edee330a46f4 (patch) | |
| tree | 016cc490cb301339bd5584464c1892bb003395b5 /kernel.spec | |
| parent | 3443735c752b7a16b34277197b7f4e0fdcfbc1e2 (diff) | |
| parent | 49d1cc4304bc17e8e8bbce32c831d8656fa04f2a (diff) | |
| download | kernel-87edb2e55d509ad15181de5e5401edee330a46f4.tar.gz kernel-87edb2e55d509ad15181de5e5401edee330a46f4.tar.xz kernel-87edb2e55d509ad15181de5e5401edee330a46f4.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc6.git3.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc6.git3.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc6.git3.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc6.git3.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 608923990..903c0d1e0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -635,6 +635,10 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1509461 Patch503: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.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 @@ -1873,6 +1877,12 @@ fi # # %changelog +* Fri May 25 2018 Jeremy Cline <jcline@redhat.com> - 4.17.0-0.rc6.git3.1 +- Linux v4.17-rc6-224-g62d18ecfa641 + +* Fri May 25 2018 Jeremy Cline <jeremy@jcline.org> +- Fix for incorrect error message about parsing PCCT (rhbz 1435837) + * Thu May 24 2018 Justin M. Forbes <jforbes@redhat.com> - 4.17.0-0.rc6.git2.1 - Linux v4.17-rc6-158-gbee797529d7c - Reenable debugging options. |