One thing, it seems that the delta that we have was never reported to Debian.
So this will forever be a merge.
You could talk to ddstreet who added them for #1774120 if he would consider prepping and reporting them to Debian as well.
An alternative to that is if we can identify a clear "end" of the need to carry the Delta.
In that case mark them as then by adding at least in the commits something like: "can be dropped >20.04". This might happen if no affected upgrade path is left anymore.
One thing, it seems that the delta that we have was never reported to Debian.
So this will forever be a merge.
You could talk to ddstreet who added them for #1774120 if he would consider prepping and reporting them to Debian as well.
An alternative to that is if we can identify a clear "end" of the need to carry the Delta.
In that case mark them as then by adding at least in the commits something like: "can be dropped >20.04". This might happen if no affected upgrade path is left anymore.