diff --git a/debian/changelog b/debian/changelog
index df59cef..3bc19c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
+[UBUNTU-ONLY; 987017e37fea2a76134b853b764b74f7425e70df]
+multipath-modules
+(UBUNTU KERNEL MODULES DON'T PROVIDE MULTIPATH-MODULES HENCE
+UNINSTALLABILITY ISSUES)
+
+[DEBIAN STUFF; 6480fb97852efb081dcaa230b47d633633903336]
+allow-stderr
+(SEND, OF COURSE)
+
 multipath-tools (0.8.5-2ubuntu1) impish; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
+
     - multipath initramfs fixes for booting from multipathed devices:
       - d/initramfs/hooks: also copy wwids file on the installed
         system to ensure all paths come up on boot. (LP 1479929)
@@ -18,62 +28,108 @@ multipath-tools (0.8.5-2ubuntu1) impish; urgency=medium
         initramfs (LP 1561103)
       - d/rules: install d/initramfs/local-bottom
       - d/rules: install d/initramfs/local-premount
+    [SUBMIT THIS TO DEBIAN; BE OPEN TO DISCUSSION]
+    [BAH, IT'S GONNA BE EW :p]
+
     - d/control: multipath-udeb: add sg3-udeb Depends
+      [to populate scsi IDs]
+    [DROP FROM DELTA; IT'S A NO-OP WITH 987017e]
+
     - patches to multipath source:
       - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted files
         some more: since we stat() the loopback device node, we can't rely
         on S_ISREG() tests to handle this case, and should look at the
         device itself instead. (LP 1543430)
+    [SEND TO UPSTREAM]
+
       - d/p/enable-find-multipaths.patch: re-enable find_multipaths by
         default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+    [SEND TO DEBIAN BUT LAST]
+    [LINK MP: http://manpages.ubuntu.com/manpages/impish/en/man5/multipath.conf.5.html]
+
     - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
       - d/initramfs/kpartx.hook
       - d/kpartx-boot.postinst
       - d/kpartx-boot.postrm
       - d/control: Add kpartx-boot package for dmraid
       - d/rules: Install kpartx initramfs hook
+      [KPARTX AVAILABLE ON BOOT]
+      [caf on MM (add_udev; just add; don't drop)]
+      [SEND THIS TO DEBIAN WITH THAT]
+
       - d/kpartx.install: install all arch /lib* kpartx udev rules
+      [CAN BE DROPPED; THERE'S NO "lib*/[...]"]
+
     - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
       for new udev rules
+    [POTENTIALLY DROP; ASK FHEIMES TO ASK IBM FOLKS; SAY NOT NEEDED]
+    [PPA WITH AND PPA WITHOUT]
+
     - Remove d/initramfs/local-top (redundant with other initramfs scripts):
       - init-top: take over loading modules (dm-multipath and SCSI device
         handlers); move the missing dm-emc there (now scsi-dh-emc; see
         BTS 567014).
       - d/rules: do not install local-top anymore.
       - remove d/initramfs/local-top
+    [SEND TO DEBIAN; BUT MERGE THE TWO FILES]
+    [OR WORTH DROPPING - RE-CHECK]
+
     - d/control: Enable udebs on riscv64 to fix FTBFS.
+    [UBUNTU-ONLY; SQUASH WITH e87b341]
+
     - d/control, d/rules: i386 related fixes
       - Stop producing udebs on i386 where we no longer have d-i or a kernel.
       - Fix debian/rules to not explode when building without udebs on i386.
       - Don't build the multipath-tools binary package on i386; we only want
         kpartx.
+    [ONLY OUR MESS]
+
     - Disable -fexceptions on multipath-udeb (LP 1489379): the flag causes
       libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
       which is not available in the installer environment.
       - d/p/disable-fexceptions-udeb.patch: conditionally disable
         -fexceptions with CFLAGS_DISABLE_FEXCEPTIONS.
       - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+    [TAKE PPA, BUILD WITHOUT THIS PATCH AND SEE LINKING]
+
     - d/p/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
       deleted message to stdout again, not stderr; to fix autopkgtest
+    [DROP WITH A REASON UPSTREAM DENIED]
+
     - d/multipath.conf: Install friendly names multipath.conf by default,
       instead of generating it in every installer.
+    [EITHER SUBMIT TO DEBIAN; IF NOT, THEN WE DROP ITSELF]
+
     - d/rules: Move udev rules to priority 95, because rules that load
       modules should be >90.
+    [CAN BE DROPPED WITH 1-LINER FROM caf9a87 FROM MM (both-combined)]
+
     - d/p/no-start-in-containers.patch: Do not attempt to start
       multipath-tools in containers, should switch for on-demand udev/socket
       based activation in the future. (LP 1823093)
+    [TRY TO UPSTREAM]
+
     - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
       finding loopback devices (LP 1747044)
+    [EITHER FORWARD UPSTREAM (see forwarded) OR KEEP IT HERE]
+
+
     - debian/initramfs/hooks: Add dm-queue-length: users may want to
       change from the default selector and should be able to do so.
       (LP 1673350)
+    [SEND THIS TO DEBIAN AFTER XYZ (previous commit) HAS BEEN MERGED; OTHERWISE REBASE]
+
     - debian/initramfs/local-bottom: wait for the multipathd unix
       socket to close, so to avoid multipathd.socket unit failure.
       (LP 1682178)
+    [ON TOP OF THIS caf9a87 COMMIT; SUBMIT TO DEBIAN; GO TOGETHER]
+
     - debian/tests/tgtbasedmpaths:
       - Add sleep to allow for device creation
       - Use stable wwn-* names in autopkgtest that work with or without
         friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+    [SEND TO DEBIAN]
+
   * Dropped changes:
     - [Undocumented] d/p/newer-jsonc.patch: drop this patch since this
       was added in v0.8.4-2ubuntu1 as a delta but was incorporated in