diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-19 07:21:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-19 07:21:00 +0200 |
| commit | 02b716391553f41a42053d8c26aa54050f261d83 (patch) | |
| tree | 5d98d8fe90326f6d632229f2612c632df5f77314 /kernel.spec | |
| parent | fb0ee5f89eaade5cb1e76dc0becf55061172ff0c (diff) | |
| parent | af495309bb553b4659f08470ac94fedf74b3845a (diff) | |
| download | kernel-02b716391553f41a42053d8c26aa54050f261d83.tar.gz kernel-02b716391553f41a42053d8c26aa54050f261d83.tar.xz kernel-02b716391553f41a42053d8c26aa54050f261d83.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 419bfd5c8..98f655f14 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 %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -623,9 +623,6 @@ Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch -#rhbz 1309487 -Patch701: antenna_select.patch - #CVE-2016-4482 rhbz 1332931 1332932 Patch706: USB-usbfs-fix-potential-infoleak-in-devio.patch @@ -2165,6 +2162,11 @@ fi # # %changelog +* Wed May 18 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git3.1 +- Linux v4.6-3623-g0b7962a +- ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs, + timers, crypto merges + * Tue May 17 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git2.2 - Adjust solib for cpupower |