Automatic rebase of branch 'tb-dev-qubes' met a conflict. - #41
Open
3mdeb-robot wants to merge 9 commits into
Open
Automatic rebase of branch 'tb-dev-qubes' met a conflict.#413mdeb-robot wants to merge 9 commits into
3mdeb-robot wants to merge 9 commits into
Conversation
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Fixes build failure due to the extra_deps.lst file not existing in the tarball. Found while trying to package GRUB 2.12 for Gentoo. make[3]: *** No rule to make target '/var/tmp/portage/sys-boot/grub-2.12/work/grub-2.12/grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. Fixes: 89fbe0c (grub-core/Makefile.am: Make path to extra_deps.lst relative to $(top_srcdir)/grub-core) Fixes: 154dcb1 (build: Allow explicit module dependencies) Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
When adding/changing the password for the luks2 partition, cryptsetup may reject the command due to the weak password. Since this is only for testing, add "--force-password" to switch password quality check off to avoid the unexpected failure. Signed-off-by: Gary Lin <glin@suse.com> Reviewed-by: Glenn Washburn <development@efficientek.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
In grub-core/fs/jfs.c, Coverity spotted redundant code where the pointer diro was being set to 0 and then being overwritten later without being used. Since this is unnecessary, we can remove the code that sets diro to 0. Fixes: CID 428876 Signed-off-by: Alec Brown <alec.r.brown@oracle.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
In grub-core/osdep/unix/getroot.c, Coverity spotted redundant code where the double pointer os_dev was being set to 0 and then being overwritten later without being used. Since this is unnecessary, we can remove the code that sets os_dev to 0. Fixes: CID 428875 Signed-off-by: Alec Brown <alec.r.brown@oracle.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
In grub-core/loader/i386/multiboot_mbi.c, Coverity spotted redundant code where the variable err was being set to GRUB_ERR_NONE and then being overwritten later without being used. Since this is unnecessary, we can remove the code that sets err to GRUB_ERR_NONE. Fixes: CID 428877 Signed-off-by: Alec Brown <alec.r.brown@oracle.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
The file_get_fs_options() takes a mach_msg_type_number_t, 32-bit, not a size_t, 64-bit on 64-bit platforms. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
The 64-bit ABI defines ld.so to be /lib/ld-x86-64.so.1. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
First repo: https://github.com/TrenchBoot/grub.git
First repo branch: tb-dev-qubes
Second repo: https://github.com/TrenchBoot/grub.git
Second repo commit:
61650d67392b959c50ccc456d6d51b6cd5c3ea5dBranch with the successfully rebased commits: tb-dev-qubes-4380c2d8ad72e4f7ffd3dae3ad1de78159c2f2ba-conflict
The commit that introduced the conflict:
4380c2d8ad72e4f7ffd3dae3ad1de78159c2f2baBefore relaunching the automatic rebase, please do the following to solve the conflict:
Fetch the remote repository:
Enter the repository.
Checkout the conflict branch created by the script:
Cherry-pick the commit that introduced the conflict
Solve the conflict and apply the commit after solving the conflict on top of the conflict branch. Important: if the conflict resolution resulted in an empty commit or you have decided not to resolve the conflict but to drop the commit - you must still add one commit to the
tb-dev-qubes-4380c2d8ad72e4f7ffd3dae3ad1de78159c2f2ba-conflictbranch, even if it is an empty commit. Otherwise the automated rebase will not continue.Push the remote repository.
Rerun all jobs for the workflow https://github.com/TrenchBoot/grub/actions/runs/29496425548 to resume automated rebase.
If you want to start the automatic rebase from the beginning, then make sure to:
tb-dev-qubes-4380c2d8ad72e4f7ffd3dae3ad1de78159c2f2ba-conflictfrom the remote repository.