diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-30 07:08:46 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-30 07:08:46 +0200 |
| commit | f851b67e69f31af400722b792d894e4de688b1f0 (patch) | |
| tree | dfda09d0bd5d93fceaeeef923ece9d5faf4745f5 /kernel.spec | |
| parent | 1c4acaf04c752745dfc681225773153fdeda2bc8 (diff) | |
| parent | 15b3057cc9f89df86ecd48dc2a3451c2b7619e49 (diff) | |
| download | kernel-f851b67e69f31af400722b792d894e4de688b1f0.tar.gz kernel-f851b67e69f31af400722b792d894e4de688b1f0.tar.xz kernel-f851b67e69f31af400722b792d894e4de688b1f0.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc2.git4.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc2.git4.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc2.git4.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 5cdb7eb85..7b0a3164f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -599,18 +599,16 @@ Patch304: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch # https://patchwork.kernel.org/patch/9820417/ Patch305: qcom-msm89xx-fixes.patch -# https://patchwork.kernel.org/patch/10173115/ -Patch306: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch +# https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861 +Patch306: arm-sdhci-esdhc-imx-fixes.patch -Patch309: arm-tegra-fix-nouveau-crash.patch - -Patch324: bcm283x-clk-audio-fixes.patch +Patch307: arm-tegra-fix-nouveau-crash.patch # Enabling Patches for the RPi3+ -Patch332: bcm2837-enable-pmu.patch -Patch333: bcm2837-lan78xx-fixes.patch +Patch330: bcm2837-enable-pmu.patch +Patch331: bcm2837-lan78xx-fixes.patch -Patch335: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +Patch332: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch # 400 - IBM (ppc/s390x) patches @@ -1863,6 +1861,12 @@ fi # # %changelog +* Fri Jun 29 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git4.1 +- Linux v4.18-rc2-207-gcd993fc4316d + +* Fri Jun 29 2018 Peter Robinson <pbrobinson@fedoraproject.org> +- Add a possible i.MX6 sdhci fix + * Thu Jun 28 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git3.1 - Linux v4.18-rc2-132-gf57494321cbf |