summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-05-11 16:57:56 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-05-11 16:57:56 +0200
commit7c560cced273f00fd01f151cdcbfed021d16ef00 (patch)
tree2ebcd4001c7b18f883dda4f219dcc476bbc440d5
parentcc7181fc13a9960b07cfd2d4d96b6da20b6be3bc (diff)
parentce2585656b05537b545b5d5ad88a1b9719d24777 (diff)
downloadkernel-7c560cced273f00fd01f151cdcbfed021d16ef00.tar.gz
kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.tar.xz
kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.zip
-rw-r--r--0001-Drop-that-for-now.patch2
-rw-r--r--0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch2
-rw-r--r--0001-put-RHEL-info-into-generated-headers.patch4
-rw-r--r--kernel.spec26
-rw-r--r--sources6
5 files changed, 27 insertions, 13 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch
index bebf781dc..58100ce9c 100644
--- a/0001-Drop-that-for-now.patch
+++ b/0001-Drop-that-for-now.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Drop that for now
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index cd977cfcb8e1..fe985765bca5 100644
+index 4a9877c61db5..015baafbaf9b 100644
--- a/Makefile
+++ b/Makefile
@@ -479,7 +479,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
index b7ac894d2..f61b5490f 100644
--- a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
+++ b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
@@ -13,7 +13,7 @@ Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-index 059939789730..5f2313c40328 100644
+index 3eb89f1eb0e1..4e415793d155 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -555,7 +555,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch
index e0efac5ac..4908fca71 100644
--- a/0001-put-RHEL-info-into-generated-headers.patch
+++ b/0001-put-RHEL-info-into-generated-headers.patch
@@ -59,10 +59,10 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 3512f7b243dc..cd977cfcb8e1 100644
+index 11fe9b1535de..4a9877c61db5 100644
--- a/Makefile
+++ b/Makefile
-@@ -1183,7 +1183,13 @@ endef
+@@ -1190,7 +1190,13 @@ endef
define filechk_version.h
echo \#define LINUX_VERSION_CODE $(shell \
expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
diff --git a/kernel.spec b/kernel.spec
index 4e0a1fc45..11924b816 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.rc4.20200508git79dede78c057.1
+%global distro_build 0.rc5.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -71,10 +71,10 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.7.0
-%define pkgrelease 0.rc4.20200508git79dede78c057.1
+%define pkgrelease 0.rc5.1
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20200508git79dede78c057.1%{?buildid}%{?dist}
+%define specrelease 0.rc5.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -566,7 +566,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200508git79dede78c057.tar.xz
+Source0: linux-5.7-rc5.tar.xz
Source1: Makefile.rhelver
@@ -1275,8 +1275,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200508git79dede78c057 -c
-mv linux-20200508git79dede78c057 linux-%{KVERREL}
+%setup -q -n kernel-5.7-rc5 -c
+mv linux-5.7-rc5 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2765,6 +2765,20 @@ fi
#
#
%changelog
+* Mon May 11 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc5.1]
+- v5.7-rc5 rebase
+- Updated changelog for the release based on e99332e7b4cd ("CKI@GitLab")
+
+* Sun May 10 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200510gite99332e7b4cd.1]
+- e99332e7b4cd rebase
+- Updated changelog for the release based on d5eeab8d7e26 ("CKI@GitLab")
+
+* Sat May 09 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200509gitd5eeab8d7e26.1]
+- d5eeab8d7e26 rebase
+- Add zero-commit to format-patch options ("Justin M. Forbes")
+- Updated changelog for the release based on 79dede78c057 ("CKI@GitLab")
+- Introduce a Sphinx documentation project (Jeremy Cline)
+
* Fri May 08 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200508git79dede78c057.1]
- 79dede78c057 rebase
- Updated changelog for the release based on a811c1fa0a02 ("CKI@GitLab")
diff --git a/sources b/sources
index f0454263c..04418dbef 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200508git79dede78c057.tar.xz) = d222da4b31dfb3352cd18625984adaf6cdc8b92b36a956a19fe80aa2e648682198027b997c27c9e032a824fde5feebe7d55b0d192ee5b4607978a078741ab1e6
-SHA512 (kernel-abi-whitelists-5.7.0-0.rc4.20200508git79dede78c057.1.tar.bz2) = 2b954346964edfe3816319872042e1858cfa6ec924acad916d85c37edbfb0fde8253cd95271c65b1c9353f1f00af053e80db24c5c777d69bf9e91dcb3cb38f6d
-SHA512 (kernel-kabi-dw-5.7.0-0.rc4.20200508git79dede78c057.1.tar.bz2) = 661d7ece3ef372a3a3f89058a338741c5b6b01cf2a603fc5469e87041adbdad6ff1dcb217539cc9a93fce81431362b2e54176355dd54639c280536c896d6e71c
+SHA512 (linux-5.7-rc5.tar.xz) = 0fbac0219c55574201d375cee1789b278e6ee683926568713f0166ad262eac6d4ae3c11d7cbdca5bef2a288f7143af8a5ed1e33621e5c7f2476f6cb239c508b7
+SHA512 (kernel-abi-whitelists-5.7.0-0.rc5.1.tar.bz2) = 07a4ac23c81e559a861e1f37632f306881704d2a32807f687f85a9b3376dfa12830495f44b9a2422fdb27cc7708dba59ea8049390c7b0afc0f5f9e27ef48547f
+SHA512 (kernel-kabi-dw-5.7.0-0.rc5.1.tar.bz2) = ba4c014babe6be4739af7cd7842fb203ea9aada9dd60abee924c4c6fc34d7fd75e0b380aa7d4ed1faefdf2da3356db0ded1d10504e1a1b1fdc3db38f621098a8