Re: [PATCH 0/5] uio hotplug support

[Greg KH]

On Fri, Sep 24, 2010 at 06:54:34PM -0700, Eric W. Biederman wrote:
> Greg KH <gregkh@xxxxxxx> writes:
> 
> > On Fri, Sep 24, 2010 at 05:05:17PM -0700, Eric W. Biederman wrote:
> >> "Hans J. Koch" <hjk@xxxxxxxxxxxxx> writes:
> >> 
> >> >
> >> > Hmm, I applied your first series of 5 patches (which I signed-off). When
> >> > trying to apply your second series, I get this from quilt:
> >> >
> >> > Applying patch 2_1-Simplify-the-lifetime-logic-of-struct-uio_device.patch
> >> > patching file drivers/uio/uio.c
> >> > Hunk #2 succeeded at 287 (offset 8 lines).
> >> > Hunk #3 succeeded at 312 (offset 8 lines).
> >> > Hunk #4 FAILED at 339.
> >> > Hunk #5 succeeded at 806 (offset 17 lines).
> >> > Hunk #6 FAILED at 831.
> >> > Hunk #7 FAILED at 858.
> >> > Hunk #8 FAILED at 889.
> >> > 4 out of 8 hunks FAILED -- rejects in file drivers/uio/uio.c
> >> > Patch 2_1-Simplify-the-lifetime-logic-of-struct-uio_device.patch does not apply (enforce with -f)
> >> >
> >> > The first series applied without any fuzz against 2.6.36-rc5.
> >> 
> >> I am stumped.  Do you perhaps have some local uio changes?
> >> 
> >> Using 2.6.36-rc5 as a base I tried it twice.  Once by taking my patches
> >> that I sent, and again by saving my email and then applying the changes.
> >> 
> >> Both times the changes applied cleanly.  No offsets, and no fuzz.  At
> >> least that is what git-am said.
> >> 
> >> Should I perhaps make a git branch you could pull?
> >
> > Try it on linux-next, as I've applied your previous patches there
> > already.
> 
> Done.  git-am on my saved mbox works without problems.  The worst
> I get is a warning about trailing whitespace.   Nothing that
> looks like the above.

Can you resend your patches?  I no longer have them in my queue as I was
waiting for Hans's ack and then he said they didn't apply so I purged
them.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/