[Click] patch: conflicts with linux-2.6.24.7 patch from the git repository

Daniel Borkmann borkmann at iogearbox.net
Tue Oct 4 06:29:24 EDT 2011


Okay, patch -p1 worked for me. I suggest, updating this is your /etc
README file. ;-)

Thanks,
Daniel

On Tue, Oct 4, 2011 at 12:11 PM, Daniel Borkmann <borkmann at iogearbox.net> wrote:
> Hi all,
>
> I just wanted to try out Click and fetched a stable vanilla
> linux-2.6.24.7. The latest Git patch for this particular version does
> not seem to work (see below), or am I missing something?
>
> Thanks for help,
> Daniel
>
> dborkma at xyz:~/linux-2.6.24.7$ patch -p0 <
> /home/dborkma/click/etc/linux-2.6.24.7-patch
> patching file b/arch/arm/mach-iop13xx/irq.c
> Hunk #1 FAILED at 38.
> Hunk #2 FAILED at 51.
> Hunk #3 FAILED at 64.
> Hunk #4 FAILED at 77.
> 4 out of 4 hunks FAILED -- saving rejects to file
> b/arch/arm/mach-iop13xx/irq.c.rej
> patching file b/arch/arm/mach-iop13xx/msi.c
> Hunk #1 FAILED at 38.
> Hunk #2 FAILED at 51.
> Hunk #3 FAILED at 64.
> Hunk #4 FAILED at 77.
> 4 out of 4 hunks FAILED -- saving rejects to file
> b/arch/arm/mach-iop13xx/msi.c.rej
> patching file b/arch/arm/mach-s3c2412/pm.c
> Hunk #1 FAILED at 52.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/arm/mach-s3c2412/pm.c.rej
> patching file b/arch/avr32/kernel/kprobes.c
> Hunk #1 FAILED at 244.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/avr32/kernel/kprobes.c.rej
> patching file b/arch/frv/kernel/gdb-stub.c
> Hunk #1 FAILED at 1331.
> Hunk #2 FAILED at 1421.
> Hunk #3 FAILED at 1696.
> 3 out of 3 hunks FAILED -- saving rejects to file
> b/arch/frv/kernel/gdb-stub.c.rej
> patching file b/arch/frv/kernel/setup.c
> Hunk #1 FAILED at 843.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/frv/kernel/setup.c.rej
> patching file b/arch/frv/mm/fault.c
> Hunk #1 FAILED at 243.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/frv/mm/fault.c.rej
> patching file b/arch/frv/mm/mmu-context.c
> Hunk #1 FAILED at 118.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/frv/mm/mmu-context.c.rej
> patching file b/arch/h8300/kernel/setup.c
> Hunk #1 FAILED at 65.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/h8300/kernel/setup.c.rej
> patching file b/arch/h8300/platform/h8300h/ptrace_h8300h.c
> Hunk #1 FAILED at 191.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/h8300/platform/h8300h/ptrace_h8300h.c.rej
> patching file b/arch/m68k/kernel/process.c
> Hunk #1 FAILED at 301.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/m68k/kernel/process.c.rej
> patching file b/arch/m68knommu/kernel/process.c
> Hunk #1 FAILED at 268.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/m68knommu/kernel/process.c.rej
> patching file b/arch/mips/au1000/common/reset.c
> Hunk #1 FAILED at 158.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/mips/au1000/common/reset.c.rej
> patching file b/arch/mips/gt64120/wrppmc/reset.c
> Hunk #1 FAILED at 23.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/mips/gt64120/wrppmc/reset.c.rej
> patching file b/arch/mips/lemote/lm2e/reset.c
> Hunk #1 FAILED at 20.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/mips/lemote/lm2e/reset.c.rej
> patching file b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
> Hunk #1 FAILED at 123.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/mips/pmc-sierra/msp71xx/msp_setup.c.rej
> patching file b/arch/powerpc/kernel/btext.c
> Hunk #1 FAILED at 318.
> Hunk #2 FAILED at 337.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/arch/powerpc/kernel/btext.c.rej
> patching file b/arch/powerpc/kernel/kprobes.c
> Hunk #1 FAILED at 519.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/powerpc/kernel/kprobes.c.rej
> patching file b/arch/powerpc/mm/hash_native_64.c
> Hunk #1 FAILED at 124.
> Hunk #2 FAILED at 448.
> Hunk #3 FAILED at 497.
> Hunk #4 FAILED at 507.
> Hunk #5 FAILED at 524.
> 5 out of 5 hunks FAILED -- saving rejects to file
> b/arch/powerpc/mm/hash_native_64.c.rej
> patching file b/arch/powerpc/mm/slb.c
> Hunk #1 FAILED at 298.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/powerpc/mm/slb.c.rej
> patching file b/arch/powerpc/mm/stab.c
> Hunk #1 FAILED at 142.
> Hunk #2 FAILED at 196.
> Hunk #3 FAILED at 265.
> 3 out of 3 hunks FAILED -- saving rejects to file b/arch/powerpc/mm/stab.c.rej
> patching file b/arch/powerpc/platforms/celleb/scc_epci.c
> Hunk #1 FAILED at 41.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/powerpc/platforms/celleb/scc_epci.c.rej
> patching file b/arch/powerpc/platforms/chrp/smp.c
> Hunk #1 FAILED at 34.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/powerpc/platforms/chrp/smp.c.rej
> patching file b/arch/ppc/kernel/smp-tbsync.c
> Hunk #1 FAILED at 70.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/ppc/kernel/smp-tbsync.c.rej
> patching file b/arch/ppc/platforms/ev64260.c
> Hunk #1 FAILED at 493.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/ppc/platforms/ev64260.c.rej
> patching file b/arch/ppc/platforms/hdpu.c
> Hunk #1 FAILED at 441.
> Hunk #2 FAILED at 807.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/arch/ppc/platforms/hdpu.c.rej
> patching file b/arch/ppc/platforms/pplus.c
> Hunk #1 FAILED at 737.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/ppc/platforms/pplus.c.rej
> patching file b/arch/ppc/platforms/prep_setup.c
> Hunk #1 FAILED at 1027.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/ppc/platforms/prep_setup.c.rej
> patching file b/arch/ppc/syslib/btext.c
> Hunk #1 FAILED at 273.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/ppc/syslib/btext.c.rej
> patching file b/arch/ppc/syslib/ibm440gx_common.c
> Hunk #1 FAILED at 155.
> Hunk #2 FAILED at 187.
> Hunk #3 FAILED at 197.
> Hunk #4 FAILED at 207.
> Hunk #5 FAILED at 224.
> 5 out of 5 hunks FAILED -- saving rejects to file
> b/arch/ppc/syslib/ibm440gx_common.c.rej
> patching file b/arch/um/include/sysdep-x86_64/barrier.h
> Hunk #1 FAILED at 2.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/um/include/sysdep-x86_64/barrier.h.rej
> patching file b/arch/v850/kernel/highres_timer.c
> Hunk #1 FAILED at 34.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/v850/kernel/highres_timer.c.rej
> patching file b/arch/v850/kernel/process.c
> Hunk #1 FAILED at 38.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/v850/kernel/process.c.rej
> patching file b/arch/v850/kernel/v850e_cache.c
> Hunk #1 FAILED at 51.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/v850/kernel/v850e_cache.c.rej
> patching file b/arch/v850/lib/memcpy.c
> Hunk #1 FAILED at 32.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/v850/lib/memcpy.c.rej
> patching file b/arch/v850/lib/memset.c
> Hunk #1 FAILED at 42.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/v850/lib/memset.c.rej
> patching file b/arch/v850/lib/negdi2.c
> Hunk #1 FAILED at 21.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/v850/lib/negdi2.c.rej
> patching file b/arch/x86/ia32/ia32_aout.c
> Hunk #1 FAILED at 412.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/x86/ia32/ia32_aout.c.rej
> patching file b/arch/x86/ia32/ia32_binfmt.c
> Hunk #1 FAILED at 203.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/x86/ia32/ia32_binfmt.c.rej
> patching file b/arch/x86/ia32/ia32_signal.c
> Hunk #1 FAILED at 487.
> Hunk #2 FAILED at 593.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/arch/x86/ia32/ia32_signal.c.rej
> patching file b/arch/x86/kernel/setup64.c
> Hunk #1 FAILED at 119.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/x86/kernel/setup64.c.rej
> patching file b/arch/x86/pci/pci.h
> Hunk #1 FAILED at 130.
> 1 out of 1 hunk FAILED -- saving rejects to file b/arch/x86/pci/pci.h.rej
> patching file b/arch/xtensa/kernel/platform.c
> Hunk #1 FAILED at 33.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/arch/xtensa/kernel/platform.c.rej
> patching file b/drivers/infiniband/hw/ipath/ipath_kernel.h
> Hunk #1 FAILED at 962.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/drivers/infiniband/hw/ipath/ipath_kernel.h.rej
> patching file b/drivers/input/joystick/iforce/iforce.h
> Hunk #1 FAILED at 47.
> Hunk #2 FAILED at 87.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/drivers/input/joystick/iforce/iforce.h.rej
> patching file b/drivers/input/serio/i8042-ppcio.h
> Hunk #1 FAILED at 77.
> Hunk #2 FAILED at 99.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/drivers/input/serio/i8042-ppcio.h.rej
> patching file b/drivers/input/tablet/gtco.c
> Hunk #1 FAILED at 278.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/drivers/input/tablet/gtco.c.rej
> patching file b/drivers/kvm/svm.c
> Hunk #1 FAILED at 130.
> Hunk #2 FAILED at 143.
> Hunk #3 FAILED at 156.
> Hunk #4 FAILED at 169.
> 4 out of 4 hunks FAILED -- saving rejects to file b/drivers/kvm/svm.c.rej
> patching file b/drivers/md/raid6sse1.c
> Hunk #1 FAILED at 148.
> 1 out of 1 hunk FAILED -- saving rejects to file b/drivers/md/raid6sse1.c.rej
> patching file b/drivers/md/raid6sse2.c
> Hunk #1 FAILED at 178.
> Hunk #2 FAILED at 195.
> Hunk #3 FAILED at 213.
> 3 out of 3 hunks FAILED -- saving rejects to file b/drivers/md/raid6sse2.c.rej
> patching file b/drivers/message/fusion/mptlan.c
> Hunk #1 FAILED at 196.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/drivers/message/fusion/mptlan.c.rej
> patching file b/drivers/mtd/nand/cmx270_nand.c
> Hunk #1 FAILED at 40.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/drivers/mtd/nand/cmx270_nand.c.rej
> patching file b/drivers/net/ioc3-eth.c
> Hunk #1 FAILED at 158.
> 1 out of 1 hunk FAILED -- saving rejects to file b/drivers/net/ioc3-eth.c.rej
> patching file b/drivers/net/wireless/hostap/hostap_hw.c
> Hunk #1 FAILED at 1982.
> Hunk #2 FAILED at 2396.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/drivers/net/wireless/hostap/hostap_hw.c.rej
> patching file b/drivers/net/wireless/rayctl.h
> Hunk #1 FAILED at 418.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/drivers/net/wireless/rayctl.h.rej
> patching file b/drivers/video/i810/i810_main.h
> Hunk #1 FAILED at 54.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/drivers/video/i810/i810_main.h.rej
> patching file b/fs/file_table.c
> Hunk #1 FAILED at 30.
> 1 out of 1 hunk FAILED -- saving rejects to file b/fs/file_table.c.rej
> patching file b/fs/super.c
> Hunk #1 FAILED at 43.
> 1 out of 1 hunk FAILED -- saving rejects to file b/fs/super.c.rej
> patching file b/include/asm-alpha/core_tsunami.h
> Hunk #1 FAILED at 282.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-alpha/core_tsunami.h.rej
> patching file b/include/asm-alpha/processor.h
> Hunk #1 FAILED at 31.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-alpha/processor.h.rej
> patching file b/include/asm-alpha/system.h
> Hunk #1 FAILED at 553.
> Hunk #2 FAILED at 575.
> Hunk #3 FAILED at 604.
> Hunk #4 FAILED at 630.
> Hunk #5 FAILED at 655.
> Hunk #6 FAILED at 665.
> Hunk #7 FAILED at 690.
> Hunk #8 FAILED at 709.
> Hunk #9 FAILED at 735.
> Hunk #10 FAILED at 758.
> Hunk #11 FAILED at 780.
> 11 out of 11 hunks FAILED -- saving rejects to file
> b/include/asm-alpha/system.h.rej
> patching file b/include/asm-arm/arch-iop13xx/iop13xx.h
> Hunk #1 FAILED at 28.
> Hunk #2 FAILED at 40.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-arm/arch-iop13xx/iop13xx.h.rej
> patching file b/include/asm-arm/arch-omap/mtd-xip.h
> Hunk #1 FAILED at 56.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-arm/arch-omap/mtd-xip.h.rej
> patching file b/include/asm-arm/arch-pxa/mtd-xip.h
> Hunk #1 FAILED at 32.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-arm/arch-pxa/mtd-xip.h.rej
> patching file b/include/asm-arm/hardware/iop3xx.h
> Hunk #1 FAILED at 289.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-arm/hardware/iop3xx.h.rej
> patching file b/include/asm-arm/system.h
> Hunk #1 FAILED at 117.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-arm/system.h.rej
> patching file b/include/asm-avr32/user.h
> Hunk #1 FAILED at 38.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-avr32/user.h.rej
> patching file b/include/asm-blackfin/processor.h
> Hunk #1 FAILED at 21.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-blackfin/processor.h.rej
> patching file b/include/asm-blackfin/system.h
> Hunk #1 FAILED at 124.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-blackfin/system.h.rej
> patching file b/include/asm-cris/arch-v10/io.h
> Hunk #1 FAILED at 184.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-cris/arch-v10/io.h.rej
> patching file b/include/asm-cris/module.h
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-cris/module.h.rej
> patching file b/include/asm-frv/bug.h
> Hunk #1 FAILED at 17.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-frv/bug.h.rej
> patching file b/include/asm-frv/fpu.h
> Hunk #1 FAILED at 6.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-frv/fpu.h.rej
> patching file b/include/asm-frv/gdb-stub.h
> Hunk #1 FAILED at 87.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-frv/gdb-stub.h.rej
> patching file b/include/asm-frv/highmem.h
> Hunk #1 FAILED at 82.
> Hunk #2 FAILED at 140.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-frv/highmem.h.rej
> patching file b/include/asm-frv/module.h
> Hunk #1 FAILED at 11.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-frv/module.h.rej
> patching file b/include/asm-frv/pgtable.h
> Hunk #1 FAILED at 176.
> Hunk #2 FAILED at 210.
> Hunk #3 FAILED at 391.
> 3 out of 3 hunks FAILED -- saving rejects to file
> b/include/asm-frv/pgtable.h.rej
> patching file b/include/asm-frv/processor.h
> Hunk #1 FAILED at 111.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-frv/processor.h.rej
> patching file b/include/asm-frv/spr-regs.h
> Hunk #1 FAILED at 329.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-frv/spr-regs.h.rej
> patching file b/include/asm-frv/system.h
> Hunk #1 FAILED at 22.
> Hunk #2 FAILED at 174.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/asm-frv/system.h.rej
> patching file b/include/asm-generic/bitops/hweight.h
> Hunk #1 FAILED at 3.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-generic/bitops/hweight.h.rej
> patching file b/include/asm-h8300/bitops.h
> Hunk #1 FAILED at 39.
> Hunk #2 FAILED at 59.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-h8300/bitops.h.rej
> patching file b/include/asm-h8300/module.h
> Hunk #1 FAILED at 3.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-h8300/module.h.rej
> patching file b/include/asm-h8300/system.h
> Hunk #1 FAILED at 78.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-h8300/system.h.rej
> patching file b/include/asm-ia64/gcc_intrin.h
> Hunk #1 FAILED at 13.
> Hunk #2 FAILED at 30.
> Hunk #3 FAILED at 96.
> Hunk #4 FAILED at 199.
> Hunk #5 FAILED at 303.
> Hunk #6 FAILED at 312.
> Hunk #7 FAILED at 321.
> Hunk #8 FAILED at 330.
> Hunk #9 FAILED at 340.
> Hunk #10 FAILED at 349.
> Hunk #11 FAILED at 358.
> Hunk #12 FAILED at 367.
> Hunk #13 FAILED at 386.
> Hunk #14 FAILED at 397.
> Hunk #15 FAILED at 418.
> Hunk #16 FAILED at 485.
> Hunk #17 FAILED at 544.
> Hunk #18 FAILED at 580.
> Hunk #19 FAILED at 600.
> 19 out of 19 hunks FAILED -- saving rejects to file
> b/include/asm-ia64/gcc_intrin.h.rej
> patching file b/include/asm-ia64/spinlock.h
> Hunk #1 FAILED at 91.
> Hunk #2 FAILED at 150.
> Hunk #3 FAILED at 169.
> 3 out of 3 hunks FAILED -- saving rejects to file
> b/include/asm-ia64/spinlock.h.rej
> patching file b/include/asm-m32r/module.h
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-m32r/module.h.rej
> patching file b/include/asm-m68k/system.h
> Hunk #1 FAILED at 163.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-m68k/system.h.rej
> patching file b/include/asm-m68knommu/mcfwdebug.h
> Hunk #1 FAILED at 108.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-m68knommu/mcfwdebug.h.rej
> patching file b/include/asm-m68knommu/system.h
> Hunk #1 FAILED at 100.
> Hunk #2 FAILED at 194.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-m68knommu/system.h.rej
> patching file b/include/asm-mips/edac.h
> Hunk #1 FAILED at 14.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-mips/edac.h.rej
> patching file b/include/asm-mips/fpu.h
> Hunk #1 FAILED at 28.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-mips/fpu.h.rej
> patching file b/include/asm-mips/io.h
> Hunk #1 FAILED at 455.
> Hunk #2 FAILED at 466.
> Hunk #3 FAILED at 479.
> Hunk #4 FAILED at 490.
> Hunk #5 FAILED at 512.
> 5 out of 5 hunks FAILED -- saving rejects to file b/include/asm-mips/io.h.rej
> patching file b/include/asm-mips/ip32/mace.h
> Hunk #1 FAILED at 308.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-mips/ip32/mace.h.rej
> patching file b/include/asm-mips/mips-boards/sim.h
> Hunk #1 FAILED at 31.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-mips/mips-boards/sim.h.rej
> patching file b/include/asm-mips/mipsregs.h
> Hunk #1 FAILED at 1049.
> Hunk #2 FAILED at 1387.
> Hunk #3 FAILED at 1491.
> Hunk #4 FAILED at 1502.
> 4 out of 4 hunks FAILED -- saving rejects to file
> b/include/asm-mips/mipsregs.h.rej
> patching file b/include/asm-mips/paccess.h
> Hunk #1 FAILED at 22.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-mips/paccess.h.rej
> patching file b/include/asm-mips/processor.h
> Hunk #1 FAILED at 233.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-mips/processor.h.rej
> patching file b/include/asm-mips/ptrace.h
> Hunk #1 FAILED at 84.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-mips/ptrace.h.rej
> patching file b/include/asm-mips/smp.h
> Hunk #1 FAILED at 111.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-mips/smp.h.rej
> patching file b/include/asm-mips/system.h
> Hunk #1 FAILED at 27.
> Hunk #2 FAILED at 189.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-mips/system.h.rej
> patching file b/include/asm-parisc/system.h
> Hunk #1 FAILED at 122.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-parisc/system.h.rej
> patching file b/include/asm-powerpc/iseries/hv_call_xm.h
> Hunk #1 FAILED at 50.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-powerpc/iseries/hv_call_xm.h.rej
> patching file b/include/asm-powerpc/reg.h
> Hunk #1 FAILED at 745.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-powerpc/reg.h.rej
> patching file b/include/asm-ppc/system.h
> Hunk #1 FAILED at 187.
> Hunk #2 FAILED at 203.
> Hunk #3 FAILED at 214.
> 3 out of 3 hunks FAILED -- saving rejects to file b/include/asm-ppc/system.h.rej
> patching file b/include/asm-s390/system.h
> Hunk #1 FAILED at 208.
> Hunk #2 FAILED at 231.
> Hunk #3 FAILED at 252.
> 3 out of 3 hunks FAILED -- saving rejects to file
> b/include/asm-s390/system.h.rej
> patching file b/include/asm-sh/module.h
> Hunk #1 FAILED at 5.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-sh/module.h.rej
> patching file b/include/asm-sh64/module.h
> Hunk #1 FAILED at 4.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-sh64/module.h.rej
> patching file b/include/asm-sparc/module.h
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-sparc/module.h.rej
> patching file b/include/asm-sparc/system.h
> Hunk #1 FAILED at 170.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-sparc/system.h.rej
> patching file b/include/asm-sparc/vaddrs.h
> Hunk #1 FAILED at 20.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-sparc/vaddrs.h.rej
> patching file b/include/asm-sparc64/module.h
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-sparc64/module.h.rej
> patching file b/include/asm-sparc64/system.h
> Hunk #1 FAILED at 86.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-sparc64/system.h.rej
> patching file b/include/asm-um/module-i386.h
> Hunk #1 FAILED at 2.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-um/module-i386.h.rej
> patching file b/include/asm-um/module-x86_64.h
> Hunk #1 FAILED at 8.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-um/module-x86_64.h.rej
> patching file b/include/asm-v850/bitops.h
> Hunk #1 FAILED at 48.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-v850/bitops.h.rej
> patching file b/include/asm-v850/system.h
> Hunk #1 FAILED at 40.
> Hunk #2 FAILED at 62.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-v850/system.h.rej
> patching file b/include/asm-v850/v850e_intc.h
> Hunk #1 FAILED at 49.
> Hunk #2 FAILED at 61.
> Hunk #3 FAILED at 93.
> 3 out of 3 hunks FAILED -- saving rejects to file
> b/include/asm-v850/v850e_intc.h.rej
> patching file b/include/asm-x86/elf.h
> Hunk #1 FAILED at 255.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/asm-x86/elf.h.rej
> patching file b/include/asm-x86/mach-voyager/irq_vectors.h
> Hunk #1 FAILED at 66.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-x86/mach-voyager/irq_vectors.h.rej
> patching file b/include/asm-x86/page_32.h
> Hunk #1 FAILED at 76.
> Hunk #2 FAILED at 109.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/asm-x86/page_32.h.rej
> patching file b/include/asm-x86/thread_info_64.h
> Hunk #1 FAILED at 60.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-x86/thread_info_64.h.rej
> patching file b/include/asm-xtensa/module.h
> Hunk #1 FAILED at 13.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-xtensa/module.h.rej
> patching file b/include/asm-xtensa/pgtable.h
> Hunk #1 FAILED at 250.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-xtensa/pgtable.h.rej
> patching file b/include/asm-xtensa/processor.h
> Hunk #1 FAILED at 190.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-xtensa/processor.h.rej
> patching file b/include/asm-xtensa/system.h
> Hunk #1 FAILED at 21.
> Hunk #2 FAILED at 51.
> Hunk #3 FAILED at 221.
> 3 out of 3 hunks FAILED -- saving rejects to file
> b/include/asm-xtensa/system.h.rej
> patching file b/include/asm-xtensa/timex.h
> Hunk #1 FAILED at 63.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/asm-xtensa/timex.h.rej
> patching file b/include/linux/compat.h
> Hunk #1 FAILED at 114.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/compat.h.rej
> patching file b/include/linux/dqblk_v1.h
> Hunk #1 FAILED at 18.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/dqblk_v1.h.rej
> patching file b/include/linux/fs.h
> Hunk #1 FAILED at 2013.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/fs.h.rej
> patching file b/include/linux/gfp.h
> Hunk #1 FAILED at 128.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/gfp.h.rej
> patching file b/include/linux/highmem.h
> Hunk #1 FAILED at 155.
> Hunk #2 FAILED at 170.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/linux/highmem.h.rej
> patching file b/include/linux/inetdevice.h
> Hunk #1 FAILED at 168.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/linux/inetdevice.h.rej
> patching file b/include/linux/jhash.h
> Hunk #1 FAILED at 44.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/jhash.h.rej
> patching file b/include/linux/kexec.h
> Hunk #1 FAILED at 106.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/kexec.h.rej
> patching file b/include/linux/ktime.h
> Hunk #1 FAILED at 71.
> Hunk #2 FAILED at 82.
> Hunk #3 FAILED at 132.
> Hunk #4 FAILED at 150.
> Hunk #5 FAILED at 223.
> Hunk #6 FAILED at 235.
> Hunk #7 FAILED at 247.
> Hunk #8 FAILED at 259.
> Hunk #9 FAILED at 318.
> 9 out of 9 hunks FAILED -- saving rejects to file b/include/linux/ktime.h.rej
> patching file b/include/linux/linkage.h
> Hunk #1 FAILED at 12.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/linkage.h.rej
> patching file b/include/linux/list.h
> Hunk #1 FAILED at 40.
> Hunk #2 FAILED at 92.
> Hunk #3 FAILED at 118.
> Hunk #4 FAILED at 139.
> Hunk #5 FAILED at 168.
> Hunk #6 FAILED at 202.
> Hunk #7 FAILED at 736.
> Hunk #8 FAILED at 762.
> Hunk #9 FAILED at 776.
> 9 out of 9 hunks FAILED -- saving rejects to file b/include/linux/list.h.rej
> patching file b/include/linux/lockdep.h
> Hunk #1 FAILED at 337.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/lockdep.h.rej
> patching file b/include/linux/mempolicy.h
> Hunk #1 FAILED at 167.
> Hunk #2 FAILED at 190.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/linux/mempolicy.h.rej
> patching file b/include/linux/mm.h
> Hunk #1 FAILED at 279.
> Hunk #2 FAILED at 296.
> Hunk #3 FAILED at 443.
> 3 out of 3 hunks FAILED -- saving rejects to file b/include/linux/mm.h.rej
> patching file b/include/linux/netdevice.h
> Hunk #1 FAILED at 716.
> Hunk #2 FAILED at 843.
> Hunk #3 FAILED at 1085.
> Hunk #4 FAILED at 1224.
> 4 out of 4 hunks FAILED -- saving rejects to file
> b/include/linux/netdevice.h.rej
> patching file b/include/linux/netlink.h
> Hunk #1 FAILED at 240.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/netlink.h.rej
> patching file b/include/linux/prefetch.h
> Hunk #1 FAILED at 54.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/prefetch.h.rej
> patching file b/include/linux/proc_fs.h
> Hunk #1 FAILED at 281.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/proc_fs.h.rej
> patching file b/include/linux/reiserfs_fs_sb.h
> Hunk #1 FAILED at 338.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/linux/reiserfs_fs_sb.h.rej
> patching file b/include/linux/rtnetlink.h
> Hunk #1 FAILED at 730.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/rtnetlink.h.rej
> patching file b/include/linux/scatterlist.h
> Hunk #1 FAILED at 290.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/linux/scatterlist.h.rej
> patching file b/include/linux/seccomp.h
> Hunk #1 FAILED at 21.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/seccomp.h.rej
> patching file b/include/linux/security.h
> Hunk #1 FAILED at 2258.
> Hunk #2 FAILED at 2267.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/linux/security.h.rej
> patching file b/include/linux/skbuff.h
> Hunk #1 FAILED at 186.
> Hunk #2 FAILED at 363.
> Hunk #3 FAILED at 1422.
> Hunk #4 FAILED at 1498.
> 4 out of 4 hunks FAILED -- saving rejects to file b/include/linux/skbuff.h.rej
> patching file b/include/linux/spinlock.h
> Hunk #1 FAILED at 53.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/spinlock.h.rej
> patching file b/include/linux/spinlock_types.h
> Hunk #1 FAILED at 20.
> Hunk #2 FAILED at 52.
> 2 out of 2 hunks FAILED -- saving rejects to file
> b/include/linux/spinlock_types.h.rej
> patching file b/include/linux/spinlock_types_up.h
> Hunk #1 FAILED at 22.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/linux/spinlock_types_up.h.rej
> patching file b/include/linux/stddef.h
> Hunk #1 FAILED at 12.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/stddef.h.rej
> patching file b/include/linux/sysctl.h
> Hunk #1 FAILED at 955.
> Hunk #2 FAILED at 1043.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/linux/sysctl.h.rej
> patching file b/include/linux/textsearch.h
> Hunk #1 FAILED at 164.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/linux/textsearch.h.rej
> patching file b/include/linux/timer.h
> Hunk #1 FAILED at 4.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/timer.h.rej
> patching file b/include/linux/types.h
> Hunk #1 FAILED at 30.
> Hunk #2 FAILED at 206.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/linux/types.h.rej
> patching file b/include/linux/unwind.h
> Hunk #1 FAILED at 14.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/linux/unwind.h.rej
> patching file b/include/linux/wait.h
> Hunk #1 FAILED at 445.
> Hunk #2 FAILED at 469.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/linux/wait.h.rej
> patching file b/include/net/compat.h
> Hunk #1 FAILED at 33.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/net/compat.h.rej
> patching file b/include/net/neighbour.h
> Hunk #1 FAILED at 237.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/net/neighbour.h.rej
> patching file b/include/net/netlink.h
> Hunk #1 FAILED at 311.
> Hunk #2 FAILED at 730.
> Hunk #3 FAILED at 746.
> Hunk #4 FAILED at 772.
> Hunk #5 FAILED at 1051.
> Hunk #6 FAILED at 1085.
> 6 out of 6 hunks FAILED -- saving rejects to file b/include/net/netlink.h.rej
> patching file b/include/net/pkt_cls.h
> Hunk #1 FAILED at 303.
> 1 out of 1 hunk FAILED -- saving rejects to file b/include/net/pkt_cls.h.rej
> patching file b/include/net/request_sock.h
> Hunk #1 FAILED at 60.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/net/request_sock.h.rej
> patching file b/include/net/route.h
> Hunk #1 FAILED at 146.
> Hunk #2 FAILED at 154.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/net/route.h.rej
> patching file b/include/net/sock.h
> Hunk #1 FAILED at 1125.
> Hunk #2 FAILED at 1394.
> 2 out of 2 hunks FAILED -- saving rejects to file b/include/net/sock.h.rej
> patching file b/include/rdma/ib_user_verbs.h
> Hunk #1 FAILED at 503.
> 1 out of 1 hunk FAILED -- saving rejects to file
> b/include/rdma/ib_user_verbs.h.rej
> patching file b/kernel/sched.c
> Hunk #1 FAILED at 5484.
> 1 out of 1 hunk FAILED -- saving rejects to file b/kernel/sched.c.rej
> patching file b/net/core/dev.c
> Hunk #1 FAILED at 238.
> Hunk #2 FAILED at 1882.
> Hunk #3 FAILED at 2015.
> Hunk #4 FAILED at 2043.
> Hunk #5 FAILED at 2076.
> Hunk #6 FAILED at 2124.
> Hunk #7 FAILED at 4469.
> Hunk #8 FAILED at 4481.
> 8 out of 8 hunks FAILED -- saving rejects to file b/net/core/dev.c.rej
> patching file b/net/core/neighbour.c
> Hunk #1 FAILED at 2638.
> 1 out of 1 hunk FAILED -- saving rejects to file b/net/core/neighbour.c.rej
> patching file b/net/core/skbuff.c
> Hunk #1 FAILED at 508.
> Hunk #2 FAILED at 2225.
> 2 out of 2 hunks FAILED -- saving rejects to file b/net/core/skbuff.c.rej
> patching file b/net/ipv4/devinet.c
> Hunk #1 FAILED at 1575.
> 1 out of 1 hunk FAILED -- saving rejects to file b/net/ipv4/devinet.c.rej
>



-- 
Web: http://gnumaniacs.org


More information about the click mailing list