diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-05-21 19:28:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-05-21 19:28:55 +0200 |
| commit | d223a2eaafa3a501ab7fed7708e004af2eb71cc7 (patch) | |
| tree | 821b9d871ccf659ab9d61810f877027d7910cbac /kernel.spec | |
| parent | d24231a1e741f14d2d026634ca85a1cd36867316 (diff) | |
| parent | 3c2b3990040395f875b0efc852bde9cfe5377351 (diff) | |
| download | kernel-d223a2eaafa3a501ab7fed7708e004af2eb71cc7.tar.gz kernel-d223a2eaafa3a501ab7fed7708e004af2eb71cc7.tar.xz kernel-d223a2eaafa3a501ab7fed7708e004af2eb71cc7.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc6.git0.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc6.git0.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc6.git0.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc6.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index a59d75c70..292f866ac 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 @@ -609,9 +609,6 @@ Patch310: arm-dts-Add-am335x-pocketbeagle.patch # https://www.spinics.net/lists/linux-tegra/msg32920.html Patch311: arm-tegra-USB-driver-dependency-fix.patch -# In linux-next, due in stable -Patch312: arm64-dts-marvell-armada-cp110-fix-hang.patch - # https://patchwork.kernel.org/patch/10354521/ # https://patchwork.kernel.org/patch/10354187/ # https://patchwork.kernel.org/patch/10306793/ @@ -1876,6 +1873,10 @@ fi # # %changelog +* Mon May 21 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc6.git0.1 +- Linux v4.17-rc6 +- Disable debugging options. + * Sun May 20 2018 Hans de Goede <hdegoede@redhat.com> - Enable GPIO_AMDPT, PINCTRL_AMD and X86_AMD_PLATFORM_DEVICE Kconfig options to fix i2c and GPIOs not working on AMD based laptops (rhbz#1510649) |