> > So most of the patch was applied except for "Hunk #2" which failed at 735. > the file Makefile.rej looks like the following. > > >[EMAIL PROTECTED]:~/src/linux$ more drivers/scsi/Makefile.rej > >*************** > >*** 727,730 **** > > > > sd_mod.o: sd.o sd_ioctl.o > > $(LD) $(LD_RFLAG) -r -o $@ sd.o sd_ioctl.o > > > >--- 735,741 ---- > > > sd_mod.o: sd.o sd_ioctl.o > > $(LD) $(LD_RFLAG) -r -o $@ sd.o sd_ioctl.o > >+ > >+ dpt_i2o.o: dpti.c > >+ $(CC) $(CFLAGS) -c dpti.c -o dpt_i2o.o > > > How can I get these lines in the correct place in the Makefile? should I > insert them manually at the line positions 727-730 and 735-741? Would this > be a problem with the version of kernel(2.2.14) that I am patching? >
Hrm. What happened was patch tried to add the lines starting with +, but apparently didn't find the lines above to know where to put it. You can look at the file (drivers/scsi/Makefile) for lines similar to those, and put the added lines following those. Probably, there's been some small change and the lines don't appear exactly as the patch expects them to. HTH, Mike McGuire
