diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-04 18:57:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-04 18:57:24 +0200 |
commit | d9398fbac9d5a5a40aecdcc263348071b467486b (patch) | |
tree | 3f8bbd4b36e1a4df0027e630aaf90a84921854ac /kernel.spec | |
parent | f94442a06c77a6e41502e4c04575079c5b5962cf (diff) | |
parent | 1ae48fff502e48163dafcf6f2d7fce8dbc4e3771 (diff) | |
download | kernel-d9398fbac9d5a5a40aecdcc263348071b467486b.tar.gz kernel-d9398fbac9d5a5a40aecdcc263348071b467486b.tar.xz kernel-d9398fbac9d5a5a40aecdcc263348071b467486b.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-1.vanilla.knurd.1.fc29kernel-4.17.0-1.vanilla.knurd.1.fc28kernel-4.17.0-1.vanilla.knurd.1.fc27kernel-4.17.0-1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index f9e16e258..2bbbb1672 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 0 +%global released_kernel 1 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -50,7 +50,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 16 +%define base_sublevel 17 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -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 7 +%global rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -622,6 +622,8 @@ Patch330: bcm2837-rpi-initial-3plus-support.patch Patch332: bcm2837-enable-pmu.patch Patch333: bcm2837-lan78xx-fixes.patch +Patch335: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -1874,6 +1876,13 @@ fi # # %changelog +* Mon Jun 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-1 +- Linux v4.17 +- Disable debugging options. + +* Sun Jun 3 2018 Peter Robinson <pbrobinson@fedoraproject.org> +- Initial support for Raspberry Pi cpufreq driver + * Thu May 31 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git2.1 - Linux v4.17-rc7-43-gdd52cb879063 |