summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-11-21 09:17:27 +0000
committerPeter Robinson <pbrobinson@gmail.com>2017-11-21 09:17:27 +0000
commit2d1ca3ead8b7e8bd492112ff2a9a519f6419331e (patch)
treec0702e1d5559c7a15d03901a5e7a1262467340ff /kernel.spec
parent0830aa88cf6702471a5aba1dc8a4ce9262331f52 (diff)
parentf43033cacbc89eabe372a7606c493e99d7d99314 (diff)
downloadkernel-2d1ca3ead8b7e8bd492112ff2a9a519f6419331e.tar.gz
kernel-2d1ca3ead8b7e8bd492112ff2a9a519f6419331e.tar.xz
kernel-2d1ca3ead8b7e8bd492112ff2a9a519f6419331e.zip
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/kernel
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec16
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec
index 3337be7ac..e0bf60a42 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 4
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -586,8 +586,6 @@ Patch302: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch
# http://patchwork.ozlabs.org/patch/587554/
Patch303: ARM-tegra-usb-no-reset.patch
-Patch304: allwinner-net-emac.patch
-
# https://www.spinics.net/lists/arm-kernel/msg554183.html
Patch305: arm-imx6-hummingboard2.patch
@@ -602,9 +600,6 @@ Patch311: USB-ulpi-fix-bus-node-lookup.patch
# Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
-# bcm2837 bluetooth support
-Patch323: bcm2837-bluetooth-support.patch
-
# https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=synquacer-netsec
Patch332: arm64-socionext-96b-enablement.patch
@@ -630,9 +625,6 @@ Patch617: Fix-for-module-sig-verification.patch
# rhbz 1431375
Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch
-# rhbz 1497861, submitted upstream, Cc: Stable
-Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
-
# rhbz 1509461
Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
@@ -2195,6 +2187,12 @@ fi
#
#
%changelog
+* Mon Nov 20 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc0.git6.1
+- Linux v4.14-12891-gc8a0739b185d
+
+* Sat Nov 18 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc0.git5.1
+- Linux v4.14-12375-g2dcd9c71c1ff
+
* Thu Nov 16 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc0.git4.1
- Linux v4.14-9248-ge60e1ee60630