diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-09 18:48:32 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-09 18:48:32 +0200 |
commit | 3ac37001f7365481683317e84b61598ebc3c1f57 (patch) | |
tree | 97215d3c805ad2e7d596c7e229bf091c14b935ad /kernel.spec | |
parent | 35e5331039d83d2f3df9c3d0f4185a895eca32f3 (diff) | |
parent | dcd325ca9e08f74233acb6578d46138bfb4c30aa (diff) | |
download | kernel-3ac37001f7365481683317e84b61598ebc3c1f57.tar.gz kernel-3ac37001f7365481683317e84b61598ebc3c1f57.tar.xz kernel-3ac37001f7365481683317e84b61598ebc3c1f57.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc0.git5.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc0.git5.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc0.git5.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc0.git5.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 2c1e3c0ce..ab7e1d58f 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 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -588,19 +588,14 @@ Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch # http://www.spinics.net/lists/linux-tegra/msg26029.html Patch301: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch -# Fix OMAP4 (pandaboard) -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: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch +Patch302: ARM-tegra-usb-no-reset.patch # https://patchwork.kernel.org/patch/9820417/ -Patch305: qcom-msm89xx-fixes.patch +Patch303: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/patch/10173115/ -Patch306: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch +Patch304: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ Patch320: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch @@ -1877,6 +1872,9 @@ fi # # %changelog +* Mon Apr 09 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git5.1 +- Linux v4.16-10608-gf8cf2f16a7c9 + * Fri Apr 06 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git4.1 - Linux v4.16-9576-g38c23685b273 |