diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-15 17:53:57 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-15 17:53:57 +0100 |
| commit | 9315d6a1050115bd2a7affaa377f58f4df76cfcd (patch) | |
| tree | dbb426bca6b490f8621b5b89755c566d80210aec /kernel.spec | |
| parent | 0ea3f3e6fa2652227ef672aab316723958c01102 (diff) | |
| parent | cf8079f29d23e9ce79043fed45f2ac7738d7f41d (diff) | |
| download | kernel-9315d6a1050115bd2a7affaa377f58f4df76cfcd.tar.gz kernel-9315d6a1050115bd2a7affaa377f58f4df76cfcd.tar.xz kernel-9315d6a1050115bd2a7affaa377f58f4df76cfcd.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc2.git2.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index fd1de5314..ad23b5f6c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -548,7 +548,7 @@ Patch430: bcm2837-initial-support.patch Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch # bcm283x mmc for wifi http://www.spinics.net/lists/arm-kernel/msg567077.html -# Patch434: bcm283x-mmc-bcm2835.patch +Patch434: bcm283x-mmc-bcm2835.patch # Upstream fixes for i2c/serial/ethernet MAC addresses Patch435: bcm283x-fixes.patch @@ -2183,6 +2183,18 @@ fi # # %changelog +* Wed Mar 15 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc2.git2.1 +- Linux v4.11-rc2-157-gae50dfd + +* Tue Mar 14 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- bcm283x mmc improvements round 2 + +* Tue Mar 14 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc2.git1.1 +- Linux v4.11-rc2-24-gfb5fe0f + +* Tue Mar 14 2017 Laura Abbott <labbott@fedoraproject.org> +- Reenable debugging options. + * Mon Mar 13 2017 Peter Robinson <pbrobinson@fedoraproject.org> 4.11.0-0.rc2.git0.2 - Disable bcm283x mmc improvements due to corner case issues |