[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: problems with patching benh kernel



> > I tried to pally a patch form you
> > with patch -p0 but i've recived:
> >
> >
> > patching file drivers/ide/ppc/pmac.c
> > patching file drivers/macintosh/Kconfig
> > patching file drivers/macintosh/mediabay.c
> > patching file drivers/macintosh/via-pmu.c
> > Hunk #2 FAILED at 138.
> > Hunk #3 FAILED at 406.
> > Hunk #4 FAILED at 711.
> > Hunk #5 FAILED at 788.
> > Hunk #6 FAILED at 1695.
>
> You evidently failed to use the correct kernel source.

Turns out it's brown paper bag time again. I had applied the preempt test
patch as well, and the two clash at least in via-pmu.c. So either apply
the preempt patch before applying the pmdisk suspend patch, or manually
apply all rejects that are caused by the clash (these appear to delete
lines containing preempt_disable() or preempt_enable()). In case deletion
of preempt related lines is all that's showing in the particular hunks,
the rejects can be safely ignored.

	Michael



Reply to: