diff --git a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch index 08db80130..81fa9b1b1 100644 --- a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch +++ b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch @@ -57,7 +57,7 @@ Signed-off-by: Laura Abbott 1 file changed, 22 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index d43120eb1dc5..1920be30a378 100644 +index b6858adc4f17..4c2da9f17514 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ diff --git a/kernel.spec b/kernel.spec index e60421066..45ad41678 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc5.1 +%global distro_build 0.rc5.20200714git0dc589da873b.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,13 +69,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.8.0 -%define pkgrelease 0.rc5.1 +%define pkgrelease 0.rc5.20200714git0dc589da873b.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.1%{?buildid}%{?dist} +%define specrelease 0.rc5.20200714git0dc589da873b.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -166,7 +166,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 # The kernel tarball/base version %define kversion 5.8 @@ -567,7 +567,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.8-rc5.tar.xz +Source0: linux-20200714git0dc589da873b.tar.xz Source1: Makefile.rhelver @@ -1299,8 +1299,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.8-rc5 -c -mv linux-5.8-rc5 linux-%{KVERREL} +%setup -q -n kernel-20200714git0dc589da873b -c +mv linux-20200714git0dc589da873b linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2830,8 +2830,8 @@ fi # # %changelog -* Mon Jul 13 2020 Fedora Kernel Team [5.8.0-0.rc5.1] -- v5.8-rc5 rebase +* Tue Jul 14 2020 Fedora Kernel Team [5.8.0-0.rc5.20200714git0dc589da873b.1] +- 0dc589da873b rebase - arm64: dts: sun50i-a64-pinephone: Add touchscreen support (Ondrej Jirman) - arm64: dts: sun50i-a64-pinephone: Enable LCD support on PinePhone (Icenowy Zheng) - drm/panel: st7703: Assert reset prior to powering down the regulators (Ondrej Jirman) diff --git a/sources b/sources index b09009b65..5eb79cb30 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.8-rc5.tar.xz) = 689e81f0f3a2927896920d9ceb627211bc8ab8023c819c3863e71c2264601f85be6f22c10ce94ff353311515c6d8d87ecbc8b11787ef30af41b32d276df04190 -SHA512 (kernel-abi-whitelists-5.8.0-0.rc5.1.tar.bz2) = 432cc86a70d52448c77b0906a2ee19e5847a13279cdd3c38918281f585caf8e3cbfd4eaa6631c9c610ea097ced6d42ab12776d68034f500d505a1f11ee94661e -SHA512 (kernel-kabi-dw-5.8.0-0.rc5.1.tar.bz2) = 1bd8c7b44b0fc562e40068430c655ee1c3d1833cf7827918739ec17fc356ff7b83fd9462a2f203a2d68f1d27eee2c92557d218731317beac8ee8a1d9df33e34d +SHA512 (linux-20200714git0dc589da873b.tar.xz) = eac3748f0345531e03b3513d410bc53538244c3316287268294b87fddf16947f6404f03321cf6ee922a3bb975de085eaaf487d08aa36652333b5621ba70d709e +SHA512 (kernel-abi-whitelists-5.8.0-0.rc5.20200714git0dc589da873b.1.tar.bz2) = e0bfb990389f4770f2bcff451ec31772c0cc3670651774cb8c22483b0ac914290cd920679c4c6636ce2f3015282a5bdcf12321d40dfe478e678c518c2527c73d +SHA512 (kernel-kabi-dw-5.8.0-0.rc5.20200714git0dc589da873b.1.tar.bz2) = 3afd063a3e30182de486ee04003e6b7a406a6bf131288cba8c5f593c2a662f30561b534e0fe9d9f7a7e5b379e368079d71e94101d7f6a1a6b57f11bd421a52ef