Thanks for the patch. But when I tried to apply it on my local machine
it failed. Can you please check this


$ git merge --no-ff "aerusso-guest/dracut-mrs/initrd-no-initramfs
Auto-merging debian/patches/series
CONFLICT (content): Merge conflict in debian/patches/series
Removing debian/patches/initramfs-restore
Automatic merge failed; fix conflicts and then commit the result.

$ git st
On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

        deleted:    debian/patches/initramfs-restore
        new file:   debian/patches/initrd-not-initramfs.patch

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   debian/patches/series

-- 
regards Thomas

Reply via email to