Comment 3 for bug 1941799

Verified locally that it builds.
The dropped change was taken upstream, and the remaining delta still looks relevant to carry.
LGTM, +1.

I've added the merge changes to git-ubuntu and sponsored the upload:

$ debuild -S -sa $(git ubuntu push-for-upload)
...
Now signing changes and any dsc files...
 signfile dsc openssh_8.4p1-6ubuntu1.dsc A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_buildinfo openssh_8.4p1-6ubuntu1.dsc openssh_8.4p1-6ubuntu1_source.buildinfo
 signfile buildinfo openssh_8.4p1-6ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc openssh_8.4p1-6ubuntu1.dsc openssh_8.4p1-6ubuntu1_source.changes
 fixup_changes buildinfo openssh_8.4p1-6ubuntu1_source.buildinfo openssh_8.4p1-6ubuntu1_source.changes
 signfile changes openssh_8.4p1-6ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files

$ dput ubuntu ../openssh_8.4p1-6ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../openssh_8.4p1-6ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../openssh_8.4p1-6ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openssh_8.4p1-6ubuntu1.dsc: done.
  Uploading openssh_8.4p1.orig.tar.gz: done.
  Uploading openssh_8.4p1-6ubuntu1.debian.tar.xz: done.
  Uploading openssh_8.4p1-6ubuntu1_source.buildinfo: done.
  Uploading openssh_8.4p1-6ubuntu1_source.changes: done.
Successfully uploaded packages.