I do not understand, what do you mean by upstream branch?
> @Konrad
>
> This merge proposes code changes to the master branch. I thought our code
> changes always were made on the upstream branches except for packaging type
> scripts which live in the packaging branch (eg. service command wrappers,
> ...). As ciborium isn't part of upstream udisks2, it's probably OK to live in
> master, but there are actual changes proposed to udisks2 code in this merge
> proposal as well. Was this intentional?
I do not understand, what do you mean by upstream branch?
> @Konrad
>
> This merge proposes code changes to the master branch. I thought our code
> changes always were made on the upstream branches except for packaging type
> scripts which live in the packaging branch (eg. service command wrappers,
> ...). As ciborium isn't part of upstream udisks2, it's probably OK to live in
> master, but there are actual changes proposed to udisks2 code in this merge
> proposal as well. Was this intentional?