[03:45] <Darxus> warning: Cannot merge binary files: intel/sof-tplg/sof-whl-rt5682.tplg (HEAD vs. f3dbde6d6e067e89af021ff767e064794afa4f4a)
[03:46] <Darxus> CONFLICT (add/add): Merge conflict in WHENCE.ubuntu
[03:46] <Darxus> That one's a text file.
[13:22] <Laney> ilasc: hey, do you know how to upgrade buildd images? Someone found https://launchpadlibrarian.net/509667382/buildlog_ubuntu-hirsute-s390x.libcbor-xs-perl_1.82-1_BUILDING.txt.gz in #ubuntu-release and it looks like it's fixed in launchpad-buildd 193 https://git.launchpad.net/launchpad-buildd/commit/?id=25d8b32caed56ba725c2b946b67f3b8622ece9d2
[13:22] <Laney> I think that's hirsute/s390x only
[13:23] <ilasc> hey Laney , that wouldn't be something I'm familiar with unfortunately
[13:23] <Laney> seems to have launchpad-buildd_191~460~ubuntu18.04.1
[13:23] <ilasc> maybe tomwardill
[13:23] <ilasc> would have an idea on the topic ?
[13:24] <ilasc> sorry Laney
[13:25] <ilasc> Tom is looking at this
[13:25] <ilasc> we'll get back to you in a few
[13:26] <tomwardill> okay, 193 has been released, so that image shouldn't be on 191
[13:26] <Laney> great
[13:26] <tomwardill> we've had a couple of images regress like this recently, not sure what the cause is... trying to work out what the fix is :)
[13:26] <Laney> Perhaps it didn't get upgraded, or glance lost the old one?
[13:27] <tomwardill> I suspect the latter, just tyring to resurrect chat logs for last time I saw this
[13:27] <Laney> nod
[13:27] <tomwardill> this info does nto appear to stay in my head for longer than about 30 seconds
[13:27] <Laney> I had that before recently too, but fortunately they were synced ones, so IS could re-run glance-simplestreams-sync to get them back
[13:27] <Laney> probably not that helpful if you directly upoad them
[13:27] <Laney> upload
[13:37] <tomwardill> Laney: got a link to the build for that log?
[13:38] <Laney> tomwardill: https://launchpad.net/ubuntu/+source/libcbor-xs-perl/1.82-1/+build/20359297
[13:38] <tomwardill> ta
[14:29] <tomwardill> Laney: confirmed the image has reverted for some reason, trying to work out why and how to fix it :)
[14:30] <tomwardill> slightly slow going as Colin is on holiday :)
[17:22] <tomwardill> Laney: I'm still looking at this, but not getting very far. The updated image appears to have vanished and attempting to recreate it didn't do anything.
[17:23] <Laney> tomwardill: thanks for the update - we were able to roll back the affected package so it's not blocking anything (at least that I know of) at the minute
[17:24] <Laney> it'll be OK to wait for cjwatso_n tomorrow if that's what you want to do IMO
[17:24] <tomwardill> thanks, I'll keep looking but I suspect that might be the faster answer :)