kernel-packages team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Seems the patch does not apply cleanly or am I missing something?

daniel@daydream:~/kexec-tools-2.0.3$ patch -p1 < ~/Downloads/ubuntu-merge.debdiff 
patching file configure
patching file configure.ac
patching file debian/changelog
patching file debian/control
patching file debian/kdump.init.d
patching file debian/kexec-load.init.d
patching file debian/kexec-tools.postinst
patching file debian/patches/coldreboot.patch
patching file debian/patches/crashdump_warning.patch
patching file debian/patches/debianize.patch
patching file debian/patches/distclean_fix.patch
patching file debian/patches/linker-option.patch
patching file debian/patches/series
patching file debian/patches/update_kexec_manpage.patch
patching file debian/rules
patching file debian/watch
patching file include/config.h
patching file include/image.h
patching file include/kexec-uImage.h
patching file include/x86/x86-linux.h
patching file kdump/Makefile
patching file kexec/arch/arm/crashdump-arm.c
patching file kexec/arch/arm/crashdump-arm.h
patching file kexec/arch/arm/include/arch/options.h
patching file kexec/arch/arm/kexec-arm.h
patching file kexec/arch/arm/kexec-uImage-arm.c
patching file kexec/arch/arm/kexec-zImage-arm.c
patching file kexec/arch/arm/Makefile
patching file kexec/arch/i386/crashdump-x86.c
Hunk #19 FAILED at 1018.
Hunk #20 FAILED at 1035.
Hunk #21 succeeded at 1077 (offset 2 lines).
Hunk #22 succeeded at 1101 (offset 2 lines).
2 out of 22 hunks FAILED -- saving rejects to file kexec/arch/i386/crashdump-x86.c.rej
patching file kexec/arch/i386/include/arch/options.h
patching file kexec/arch/i386/kexec-beoboot-x86.c
patching file kexec/arch/i386/kexec-bzImage.c
patching file kexec/arch/i386/kexec-elf-x86.c
patching file kexec/arch/i386/kexec-multiboot-x86.c
patching file kexec/arch/i386/kexec-x86-common.c
patching file kexec/arch/i386/kexec-x86.h
patching file kexec/arch/i386/x86-linux-setup.c
patching file kexec/arch/i386/x86-linux-setup.h
patching file kexec/arch/ia64/crashdump-ia64.c
patching file kexec/arch/ia64/kexec-elf-ia64.c
patching file kexec/arch/ia64/kexec-ia64.c
patching file kexec/arch/mips/crashdump-mips.c
patching file kexec/arch/mips/kexec-elf-mips.c
patching file kexec/arch/ppc/crashdump-powerpc.c
patching file kexec/arch/ppc/crashdump-powerpc.h
patching file kexec/arch/ppc/fixup_dtb.c
patching file kexec/arch/ppc/fs2dt.c
patching file kexec/arch/ppc/include/arch/options.h
patching file kexec/arch/ppc/include/page.h
patching file kexec/arch/ppc/kexec-dol-ppc.c
patching file kexec/arch/ppc/kexec-elf-ppc.c
patching file kexec/arch/ppc/kexec-ppc.c
patching file kexec/arch/ppc/kexec-uImage-ppc.c
patching file kexec/arch/ppc/libfdt/fdt.c
patching file kexec/arch/ppc/libfdt/fdt.h
patching file kexec/arch/ppc/libfdt/fdt_ro.c
patching file kexec/arch/ppc/libfdt/fdt_rw.c
patching file kexec/arch/ppc/libfdt/fdt_strerror.c
patching file kexec/arch/ppc/libfdt/fdt_sw.c
patching file kexec/arch/ppc/libfdt/fdt_wip.c
patching file kexec/arch/ppc/libfdt/libfdt_env.h
patching file kexec/arch/ppc/libfdt/libfdt.h
patching file kexec/arch/ppc/libfdt/libfdt_internal.h
patching file kexec/arch/ppc/libfdt/Makefile.libfdt
patching file kexec/arch/ppc/libfdt-wrapper.c
patching file kexec/arch/ppc/Makefile
patching file kexec/arch/ppc64/crashdump-ppc64.c
patching file kexec/arch/ppc64/crashdump-ppc64.h
patching file kexec/arch/ppc64/fs2dt.c
patching file kexec/arch/ppc64/kexec-elf-ppc64.c
patching file kexec/arch/ppc64/kexec-ppc64.c
patching file kexec/arch/s390/kexec-image.c
patching file kexec/arch/s390/kexec-s390.h
patching file kexec/arch/sh/crashdump-sh.c
patching file kexec/arch/sh/kexec-netbsd-sh.c
patching file kexec/arch/sh/kexec-uImage-sh.c
patching file kexec/arch/sh/kexec-zImage-sh.c
patching file kexec/arch/sh/Makefile
File kexec/arch/x86_64/include/arch/options.h is not a regular file -- refusing to patch
2 out of 2 hunks ignored -- saving rejects to file kexec/arch/x86_64/include/arch/options.h.rej
patching file kexec/arch/x86_64/kexec-bzImage64.c
patching file kexec/arch/x86_64/kexec-elf-rel-x86_64.c
patching file kexec/arch/x86_64/kexec-elf-x86_64.c
patching file kexec/arch/x86_64/kexec-x86_64.c
patching file kexec/arch/x86_64/kexec-x86_64.h
patching file kexec/arch/x86_64/Makefile
patching file kexec/arch_reuse_initrd.c
patching file kexec/crashdump.c
patching file kexec/crashdump-elf.c
patching file kexec/crashdump-xen.c
patching file kexec/fs2dt.c
patching file kexec/fs2dt.h
patching file kexec/kexec.8
Reversed (or previously applied) patch detected!  Assume -R? [n] 

Maybe a patch against the Debian version is easier?

-- 
You received this bug notification because you are a member of Kernel
Packages, which is subscribed to kexec-tools in Ubuntu.
https://bugs.launchpad.net/bugs/1271127

Title:
  Please merge kexec-tools 1:2.0.4-1 (main) from debian unstable

Status in “kexec-tools” package in Ubuntu:
  In Progress

Bug description:
  Need merging

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/kexec-tools/+bug/1271127/+subscriptions