From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1980#note_1067924279
I did a simulation here, using following steps, inside a kernel-ark checkout: ``` git checkout -b tmp b4f81e09279e3c37243c35a40947bab779eabd55 git merge split-loggen # this is my branch with changes of this MR make LOCALVERSION="" dist-release git merge origin/master make LOCALVERSION="" dist-release ``` And this is the result of the last release commit with just the master merge: ``` $ git show -p f4a834d051e7cf13707b42475355cd79b79d2533 commit f4a834d051e7cf13707b42475355cd79b79d2533 (HEAD -> tmp) Author: Herton R. Krzesinski <[email protected]> Date: Wed Aug 17 12:50:22 2022 -0300 [redhat] kernel-6.0.0-0.rc1.3cc40a443a04.15 Signed-off-by: Herton R. Krzesinski <[email protected]> diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e65c2fc923e..39d4dc1fe57d 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 14 +RHEL_RELEASE = 15 # # ZSTREAM diff --git a/redhat/kernel.changelog-9.99 b/redhat/kernel.changelog-9.99 index 8d861210ed9e..337912c32c5f 100644 --- a/redhat/kernel.changelog-9.99 +++ b/redhat/kernel.changelog-9.99 @@ -1,3 +1,7 @@ +* Wed Aug 17 2022 Herton R. Krzesinski <[email protected]> [6.0.0-0.rc1.3cc40a443a04.15] +- 3cc40a443a04 rebase +Resolves: + * Wed Aug 17 2022 Herton R. Krzesinski <[email protected]> [6.0.0-0.rc1.14] - redhat: fix dist-release build number test (Herton R. Krzesinski) - redhat: fix release number bump when dist-release-changed runs (Herton R. Krzesinski) diff --git a/redhat/marker b/redhat/marker index 60cf3a175526..6fa36a12cba0 100644 --- a/redhat/marker +++ b/redhat/marker @@ -1 +1 @@ -v6.0-rc1 +3cc40a443a04 ``` _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
