My standard way of reviewing a merge is to do the merge myself and see what comes up different. Here are my observations:
conf/initramfs.conf: the commented COMPRESSLEVEL setting should match the default, which for us is 1, not 3.
debian/control: upstream has Recommends: ${busybox:Recommends}, zstd, but you only have Recommends: zstd. Why?
debian/rules: you caught that there were build-time tests added by us that should be retained even though upstream dropped their override; good (I missed this).
hook-functions: upstream landed the change to exclude modems from the net usb drivers, but we had cdc-phonet.ko in our list but Debian does not. I do not know why Debian did not include it; I think we should include it in the merge and forward to Debian for consideration.
My standard way of reviewing a merge is to do the merge myself and see what comes up different. Here are my observations:
conf/initramfs. conf: the commented COMPRESSLEVEL setting should match the default, which for us is 1, not 3.
debian/control: upstream has Recommends: ${busybox: Recommends} , zstd, but you only have Recommends: zstd. Why?
debian/rules: you caught that there were build-time tests added by us that should be retained even though upstream dropped their override; good (I missed this).
hook-functions: upstream landed the change to exclude modems from the net usb drivers, but we had cdc-phonet.ko in our list but Debian does not. I do not know why Debian did not include it; I think we should include it in the merge and forward to Debian for consideration.
+ elif [ -n "${DEVICE}" ] || [ -n "${DEVICE6}" ]; then
FWIW I would write this as elif [ -n "$DEVICE$DEVICE6" ]; then
Otherwise, this looks good to me.