diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-07 09:01:31 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-07 09:01:31 +0200 |
| commit | fdd04f2e2f251e0eaf68d07e13c8747c2831b71e (patch) | |
| tree | 412c3ca79226c4be73b2b097747104c5bfd222e1 /kernel.spec | |
| parent | e4791cbbe3bb758b0d2940f8922fb7b17d46eb74 (diff) | |
| parent | cb6ef876a0ac2bdd3c2c3ca929a318919ff04c7d (diff) | |
| download | kernel-fdd04f2e2f251e0eaf68d07e13c8747c2831b71e.tar.gz kernel-fdd04f2e2f251e0eaf68d07e13c8747c2831b71e.tar.xz kernel-fdd04f2e2f251e0eaf68d07e13c8747c2831b71e.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc0.git3.2.vanilla.knurd.1.fc26kernel-4.9.0-0.rc0.git3.2.vanilla.knurd.1.fc25kernel-4.9.0-0.rc0.git3.2.vanilla.knurd.1.fc24kernel-4.9.0-0.rc0.git3.2.vanilla.knurd.1.fc23
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 430dcc03e..31e7a943c 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 1 +%global baserelease 2 %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 @@ -635,6 +635,9 @@ Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch #CVE-2016-7425 rhbz 1377330 1377331 Patch850: arcmsr-buffer-overflow-in-archmsr_iop_message_xfer.patch +# Fix came in locally +Patch851: 0001-drivers-net-phy-Correct-duplicate-MDIO_XGENE-entry.patch + # END OF PATCH DEFINITIONS %endif @@ -2174,6 +2177,12 @@ fi # # %changelog +* Thu Oct 06 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git3.2 +- Disable CONFIG_DEBUG_TEST_DRIVER_REMOVE + +* Thu Oct 06 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git3.1 +- Linux v4.8-8780-gd230ec7 + * Wed Oct 05 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git2.1 - Linux v4.8-2283-ga3443cd |