From: Scott Weaver on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3971 This creates a new CI job to regularly merge the kernel-ark tree with linux-next. The primary goal is to proactively identify integration issues, conflicts and bugs before they land in the main os-build branch. This initial version is a proof-of-concept and does not, for example, yet include any logic for automatically resolving merge conflicts or analyzing config mismatches. It serves as a foundation for building more sophisticated automation to help resolve these types of problems in the future This also introduces the `dist-configs-commit-mismatches` make target to resolve config mismatches. Signed-off-by: Scott Weaver <scweaver@xxxxxxxxxx> --- redhat/configs/process_configs.sh | 193 +++++++++++++++++++++++++++++++---- redhat/scripts/ci/ark-linux-next.sh | 60 +++++++++++ redhat/Makefile | 4 + .gitlab-ci.yml | 22 ++++ 4 files changed, 257 insertions(+), 22 deletions(-) -- _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx 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/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
