diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-03-06 18:57:38 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-03-06 18:57:38 +0100 |
| commit | 5dda76897952f6673729d314146f042465f98a83 (patch) | |
| tree | 90f21a2aa7eb1776f53cc84328352c746860493a /kernel.spec | |
| parent | c93c7889c0c686240393572a34d20e0c98836753 (diff) | |
| parent | 5650295ae7d914eb931d3830d91a739dccd0915b (diff) | |
| download | kernel-5dda76897952f6673729d314146f042465f98a83.tar.gz kernel-5dda76897952f6673729d314146f042465f98a83.tar.xz kernel-5dda76897952f6673729d314146f042465f98a83.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 69ff594bb..b2d228019 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -208,7 +208,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -847,6 +847,8 @@ Patch312: bcm2835-irqchip-Quiesce-IRQs-left-enabled-by-bootloader.patch Patch313: ARM-dts-bcm283x-Add-missing-properties-to-the-PWR-LED.patch # https://patchwork.kernel.org/patch/11406785/ Patch314: ARM-dts-bcm2711-Add-pcie0-alias.patch +# https://patchwork.kernel.org/patch/11420129/ +Patch315: ARM-dts-bcm2711-Move-emmc2-into-its-own-bus.patch # Tegra bits # https://www.spinics.net/lists/linux-tegra/msg48152.html @@ -873,7 +875,7 @@ Patch342: Add-LCD-support-for-Pine64-Pinebook-1080p.patch Patch343: arm64-pine64-pinetab.patch # https://www.spinics.net/lists/arm-kernel/msg789135.html Patch344: arm64-pine64-pinephone.patch -# v2 https://patchwork.kernel.org/cover/11413255/ +# v4 https://patchwork.kernel.org/cover/11420797/ Patch345: Add-support-for-the-pine64-Pinebook-Pro.patch # 400 - IBM (ppc/s390x) patches @@ -2974,6 +2976,12 @@ fi # # %changelog +* Fri Mar 06 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc4.git1.1 +- Linux v5.6-rc4-135-gaeb542a1b5c5 + +* Fri Mar 06 2020 Jeremy Cline <jcline@redhat.com> +- Reenable debugging options. + * Mon Mar 02 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc4.git0.1 - Linux v5.6-rc4 |