diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-02 19:42:41 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-02 19:42:41 +0100 |
| commit | 89a5fb9b81444cc454701bef82d39ccf79a4f2b6 (patch) | |
| tree | 270f1dcb39f4d254b148ee5cb216e3275dda1da6 /kernel.spec | |
| parent | c134eeac30df0957c7603fac52e7916434dc0819 (diff) | |
| parent | c3110e368218e094a23feffa69ab71ffbddea773 (diff) | |
| download | kernel-89a5fb9b81444cc454701bef82d39ccf79a4f2b6.tar.gz kernel-89a5fb9b81444cc454701bef82d39ccf79a4f2b6.tar.xz kernel-89a5fb9b81444cc454701bef82d39ccf79a4f2b6.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.21.0-0.rc0.git5.1.vanilla.knurd.1.fc30kernel-4.21.0-0.rc0.git5.1.vanilla.knurd.1.fc29kernel-4.21.0-0.rc0.git5.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 5161ce10b..80ec58a90 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 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -596,9 +596,6 @@ Patch306: arm-sdhci-esdhc-imx-fixes.patch Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch -# https://patchwork.kernel.org/patch/10686407/ -Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch - # Improve raspberry pi camera and analog audio # Needs to be rebased # Patch333: bcm2835-vc04_services-Improve-driver-load-unload.patch @@ -624,6 +621,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1645070 patch queued upstream for merging into 4.21 Patch505: asus-fx503-keyb.patch +# nvlink failure +Patch506: 0001-Drop-that-def_bool.patch + # END OF PATCH DEFINITIONS %endif @@ -1898,6 +1898,9 @@ fi # # %changelog +* Wed Jan 02 2019 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git5.1 +- Linux v4.20-10595-g8e143b90e4d4 + * Mon Dec 31 2018 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git4.1 - Linux v4.20-9221-gf12e840c819b |