Wind River Support Network

HomeOther DownloadsPatch conflict when "make -C build linux" if configuring with --with-template=feature/rt.
Recommended Type: Patch

Patch conflict when "make -C build linux" if configuring with --with-template=feature/rt.

Released: Sep 16, 2008     Updated: Sep 16, 2008


Applying patch file /lpgtest12/cdc/fall06-1.4.1-lx05/wrlinux-1.4/wrlinux/templates/feature/rt/linux/2.6.14/revert-patches/hrt_revert.diff.cgl …
patching file Documentation/DocBook/kernel-api.tmpl
patching file Documentation/hrtimers.txt
patching file arch/i386/Kconfig
patching file fs/exec.c
Hunk #1 succeeded at 656 (offset -1 lines).
patching file fs/proc/array.c
patching file include/linux/calc64.h
patching file include/linux/jiffies.h
patching file include/linux/ktime.h
patching file include/linux/posix-timers.h
patching file include/linux/sched.h
Hunk #1 succeeded at 106 (offset -1 lines).
patching file include/linux/timer.h
patching file init/main.c
Hunk #1 succeeded at 489 with fuzz 2 (offset -2 lines).
patching file kernel/Makefile
patching file kernel/exit.c
Hunk #1 succeeded at 895 (offset -3 lines).
patching file kernel/fork.c
Hunk #1 succeeded at 851 (offset -4 lines).
patching file kernel/hrtimer.c
Reversed (or previously applied) patch detected! Assume -R? [n]

WRLinux Version: 1.4.1
Binary/FS From: fall06-release + wrlinux_1.4_sp1_lx05
BSP/Configuration: intel_mpcbl0040-cgl-glibc_small
HOST OS: Red Hat Enterprise Lintel_mpcbl0040inux WS release 4 (Nahant)


Product Version

Linux Platforms 1.x


Installation Notes

Installation Notes

  1. Unzip the patch under [install_dir]/updates

    2. Install the patch CD by entering the patch CD directory and run setup_linux.

    3. This is a source only patch so you will have to build the kernel

    4. Issue a make fs and make the kernel in a configured directory.

    5. Upload the kernel and rootfs into the target and boot it up.

Live chat