diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-06 20:42:16 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-06 20:42:16 +0100 |
commit | 1429580bfd405c147e4bde3a00b270b07b2e6c13 (patch) | |
tree | 5b4049bd5657007584c269325afeea490ed52c2e /kernel.spec | |
parent | 889961e7d1825ddabd68eaa9ea87e8700cb14783 (diff) | |
parent | 4bdf8f6ab4722f4a976929b018b57029a197ffc7 (diff) | |
download | kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.tar.gz kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.tar.xz kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 447ce3a23..9bb7ec893 100644 --- a/kernel.spec +++ b/kernel.spec @@ -112,7 +112,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -474,7 +474,7 @@ Summary: The Linux kernel # We only build kernel-headers on the following... %if 0%{?fedora} -%define nobuildarches i386 ppc64le +%define nobuildarches i386 %else %define nobuildarches i386 i686 %endif @@ -836,8 +836,6 @@ Patch305: ARM-tegra-usb-no-reset.patch Patch320: arm64-tegra-jetson-tx1-fixes.patch # https://www.spinics.net/lists/linux-tegra/msg43110.html Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch -# https://www.spinics.net/lists/linux-tegra/msg44216.html -Patch324: arm64-tegra186-enable-USB-on-Jetson-TX2.patch # 400 - IBM (ppc/s390x) patches @@ -2909,6 +2907,9 @@ fi # # %changelog +* Fri Dec 06 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git7.1 +- Linux v5.4-12941-gb0d4beaa5a4b + * Thu Dec 05 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git6.1 - Linux v5.4-11747-g2f13437b8917 |