summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-12-12 19:42:26 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-12-12 19:42:26 +0100
commitee4f70818324edbf5258381796275c7941857395 (patch)
tree1e6303051949ee28c4d20ffdc6fe4d371a3df361 /kernel.spec
parent0fb08a81718e310fb0ef148b97be4030c5a26ec5 (diff)
parent17322a1f6ae8d662d9605806dbd924208dec8325 (diff)
downloadkernel-ee4f70818324edbf5258381796275c7941857395.tar.gz
kernel-ee4f70818324edbf5258381796275c7941857395.tar.xz
kernel-ee4f70818324edbf5258381796275c7941857395.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc1.git2.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc1.git2.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 2104c7e70..54586568e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -112,7 +112,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 1
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -830,7 +830,7 @@ Patch302: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
# rhbz 1574718
Patch303: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
-Patch305: ARM-tegra-usb-no-reset.patch
+Patch304: ARM-tegra-usb-no-reset.patch
# Tegra bits
Patch320: arm64-tegra-jetson-tx1-fixes.patch
@@ -2910,6 +2910,13 @@ fi
#
#
%changelog
+* Thu Dec 12 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc1.git2.1
+- Linux v5.5-rc1-27-gae4b064e2a61
+
+* Tue Dec 10 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+- Updates for ARMv7/aarch64
+- Enable newer TI ARMv7 platforms
+
* Tue Dec 10 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc1.git1.1
- Linux v5.5-rc1-12-g6794862a16ef
- Reenable debugging options.