Am 03.07.2020 um 11:52 hat Max Reitz geschrieben: > On 03.07.20 10:07, Kevin Wolf wrote: > > Am 24.06.2020 um 16:04 hat Alex Bennée geschrieben: > >> From: Philippe Mathieu-Daudé <[email protected]> > >> > >> Commit 96927c744 replaced qdev_init_nofail() call by > >> isa_realize_and_unref() which has a different error > >> message. Update the test output accordingly. > >> > >> Gitlab CI error after merging b77b5b3dc7: > >> https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375 > >> > >> Reported-by: Thomas Huth <[email protected]> > >> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > >> Signed-off-by: Alex Bennée <[email protected]> > >> Reviewed-by: John Snow <[email protected]> > >> Reviewed-by: Thomas Huth <[email protected]> > >> Message-Id: <[email protected]> > > > > Thanks, applied (this individual patch) to the block branch. > > Hm, I’ve already included it in my pull request from last week: > > https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg01159.html > > Unfortunately, the request got no response so far.
I see. But as long as the patch is present in unchanged form in both trees, git will sort it out. Kevin
