diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-03 23:06:28 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-03 23:06:28 +0200 |
| commit | 675c6a984e300e78faa7bb46613000a172e744e5 (patch) | |
| tree | d25b9eab67e56c99def6a8ffde3d073be39683a6 /kernel.spec | |
| parent | 16f5fa6eeeaf1543fe106ee66d5b06d06b5474e7 (diff) | |
| parent | 2703d9b16cc4a0cf8b5c25c8af390663092f455b (diff) | |
| download | kernel-675c6a984e300e78faa7bb46613000a172e744e5.tar.gz kernel-675c6a984e300e78faa7bb46613000a172e744e5.tar.xz kernel-675c6a984e300e78faa7bb46613000a172e744e5.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index ebd362038..b9b8e171a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,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 5.%{upstream_sublevel}.0 %endif @@ -837,8 +837,6 @@ Patch303: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch Patch304: ARM-tegra-usb-no-reset.patch # Raspberry Pi -# https://patchwork.kernel.org/cover/11353083/ -Patch310: arm64-pinctrl-bcm2835-Add-support-for-all-BCM2711-GPIOs.patch # v5 https://patchwork.kernel.org/cover/11429245/ Patch311: USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch # https://patchwork.kernel.org/patch/11420129/ @@ -899,6 +897,9 @@ Patch510: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1820196 Patch511: 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch +# Fixes build on s390 and should be upstream after rc1 +Patch512: export_sysrq_mask.patch + # END OF PATCH DEFINITIONS %endif @@ -2997,6 +2998,9 @@ fi # # %changelog +* Fri Apr 03 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.0-0.rc0.git5.1 +- Linux v5.6-9431-gbef7b2a7be28 + * Thu Apr 02 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.0-0.rc0.git4.1 - Linux v5.6-7632-g919dce24701f |