diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-25 16:25:48 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-25 16:25:48 +0100 |
| commit | ae2938718497f769a7fd994615f33eb2a70efeb5 (patch) | |
| tree | ebbbfa5656c954b519b2dccb9ff9df400fb8a4bb /kernel.spec | |
| parent | aa81f23c8a4676a10aca4e53a5b490f9df6639a4 (diff) | |
| parent | 45e5a1f373d708b10afabbf252d240a2e73b78e1 (diff) | |
| download | kernel-ae2938718497f769a7fd994615f33eb2a70efeb5.tar.gz kernel-ae2938718497f769a7fd994615f33eb2a70efeb5.tar.xz kernel-ae2938718497f769a7fd994615f33eb2a70efeb5.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc2.git0.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc2.git0.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc2.git0.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc2.git0.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 4c20ee448..add029970 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 1 +%global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -585,6 +585,12 @@ Patch312: arm64-rock960-enable-tsadc.patch Patch339: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +# Tegra bits +Patch340: arm64-tegra-jetson-tx1-fixes.patch + +# https://patchwork.kernel.org/patch/10858639/ +Patch341: arm64-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -599,6 +605,9 @@ Patch507: 0001-Drop-that-for-now.patch # rhbz 1689750, patch submitted upstream Patch508: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch +# rhbz 1688283 +Patch512: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch + # END OF PATCH DEFINITIONS %endif @@ -1875,6 +1884,16 @@ fi # # %changelog +* Mon Mar 25 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc2.git0.1 +- Linux v5.1-rc2 + +* Mon Mar 25 2019 Jeremy Cline <jcline@redhat.com> +- Disable debugging options. + +* Sat Mar 23 2019 Peter Robinson <pbrobinson@fedoraproject.org> +- Fixes for Tegra Jetson TX series +- Initial support for NVIDIA Jetson Nano + * Fri Mar 22 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc1.git2.1 - Linux v5.1-rc1-66-gfd1f297b794c |