diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-01 18:28:41 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-01 18:28:41 +0200 |
commit | f7d15625ed49069bd395358e146c029efd20ada4 (patch) | |
tree | fb113583d24b442347a20359e30be7bdfa9d0f65 /kernel.spec | |
parent | 076185919338bd6647617b73828c027b4586c8f7 (diff) | |
parent | b7efa4858d4a5d60080f115d2939097306393964 (diff) | |
download | kernel-f7d15625ed49069bd395358e146c029efd20ada4.tar.gz kernel-f7d15625ed49069bd395358e146c029efd20ada4.tar.xz kernel-f7d15625ed49069bd395358e146c029efd20ada4.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc6.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc6.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc6.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc6.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 9600e7ab9..00a9c6e38 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 5 +%global rcrev 6 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -610,6 +610,12 @@ Patch310: gpio-pxa-handle-corner-case-of-unprobed-device.patch Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +# Patches enabling device specific brcm firmware nvram +Patch340: 0001-brcmfmac-Remove-firmware-loading-code-duplication.patch +Patch341: 0002-brcmfmac-Remove-recursion-from-firmware-load-error-h.patch +Patch342: 0003-brcmfmac-Add-support-for-first-trying-to-get-a-board.patch +Patch343: 0004-brcmfmac-Set-board_type-used-for-nvram-file-selectio.patch + # Fix for AllWinner A64 Timer Errata, still not final # https://patchwork.kernel.org/patch/10392891/ Patch350: arm64-arch_timer-Workaround-for-Allwinner-A64-timer-instability.patch @@ -1897,6 +1903,15 @@ fi # # %changelog +* Mon Oct 01 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc6.git0.1 +- Linux v4.19-rc6 + +* Mon Oct 01 2018 Jeremy Cline <jcline@redhat.com> +- Disable debugging options. + +* Mon Oct 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> +- Support loading device specific NVRAM files on brcm WiFi devices + * Fri Sep 28 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc5.git3.1 - Linux v4.19-rc5-159-gad0371482b1e |