lkml.org 
[lkml]   [2010]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 0/5] uio hotplug support
Greg KH <gregkh@suse.de> writes:

> On Fri, Sep 24, 2010 at 05:05:17PM -0700, Eric W. Biederman wrote:
>> "Hans J. Koch" <hjk@linutronix.de> 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.

Eric


\
 
 \ /
  Last update: 2010-09-27 20:09    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site