Closed dustymabe closed 2 months ago
/cherry-pick rhcos-4.16
@dustymabe: #3789 failed to apply on top of branch "rhcos-4.16":
Applying: mantle/platform/qemu: Adjust dependencies on journal-stream unit
Applying: mantle/platform/qemu: drop json formatting from journal output
Applying: mantle/kola/testiso: fix firmware entries for multi-arch iscsi tests
Using index info to reconstruct a base tree...
M mantle/cmd/kola/testiso.go
Falling back to patching base and 3-way merge...
Auto-merging mantle/cmd/kola/testiso.go
CONFLICT (content): Merge conflict in mantle/cmd/kola/testiso.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 mantle/kola/testiso: fix firmware entries for multi-arch iscsi tests
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Follow-up in https://github.com/coreos/coreos-assembler/pull/3799.
See individual commit messages.