summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-10-30 20:17:09 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2018-10-30 20:17:09 +0100
commit7158faaa9bb114d4c7573eb3e529da4f0156a5f1 (patch)
tree80b6fbd326da6cd87c6a9c49d2ffe0b95c292421 /kernel.spec
parentec86f0ba78d10d2f5a8c2b7c37f786d00624e544 (diff)
parent968d59bf949ed86f4cd74809a62ec826c39ed58d (diff)
downloadkernel-7158faaa9bb114d4c7573eb3e529da4f0156a5f1.tar.gz
kernel-7158faaa9bb114d4c7573eb3e529da4f0156a5f1.tar.xz
kernel-7158faaa9bb114d4c7573eb3e529da4f0156a5f1.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc0.git6.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc0.git6.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index d170b9d24..25e65630a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -598,12 +598,6 @@ Patch305: qcom-msm89xx-fixes.patch
# https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
Patch306: arm-sdhci-esdhc-imx-fixes.patch
-# https://www.spinics.net/lists/arm-kernel/msg670137.html
-Patch307: arm64-ZynqMP-firmware-clock-drivers-core.patch
-
-Patch308: arm64-96boards-Rock960-CE-board-support.patch
-Patch309: arm64-rockchip-add-initial-Rockpro64.patch
-
Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
@@ -1902,6 +1896,9 @@ fi
#
#
%changelog
+* Tue Oct 30 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc0.git6.1
+- Linux v4.19-11706-g11743c56785c
+
* Mon Oct 29 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc0.git5.1
- Linux v4.19-9448-g673c790e7282