[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <BANLkTimJr=SXCs+0u4wutHz9TawVcvkcVg@mail.gmail.com>
Date: Thu, 19 May 2011 21:31:49 -0700
From: matt mooney <mfmooney@...il.com>
To: Greg KH <greg@...ah.com>
Cc: matt mooney <mfm@...eddisk.com>, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: Re: [PATCH] staging: usbip: replace usbip_u{dbg,err,info} and printk
with dev_ and pr_
On Thu, May 19, 2011 at 9:12 PM, Greg KH <greg@...ah.com> wrote:
> On Thu, May 19, 2011 at 07:30:39PM -0700, matt mooney wrote:
>> On Thu, May 19, 2011 at 5:24 PM, Greg KH <greg@...ah.com> wrote:
>> > On Thu, May 19, 2011 at 05:17:45PM -0700, matt mooney wrote:
>> >> On Thu, May 19, 2011 at 5:00 PM, Greg KH <greg@...ah.com> wrote:
>> >> > Also, the merge window for the .40 tree for the staging tree is now
>> >> > closed, so I'll only take bugfixes for the usbip code for now.
>> >>
>> >> The userspace code isn't getting merged in .40, is it? Because my
>> >> patch "staging: usbip: userspace: stub_driver.c: update kernel module
>> >> name" actually relies on a change in my own tree, so I made a mistake
>> >> by thinking that it was needed right away to get the userspace tools
>> >> working.
>> >
>> > It's in my tree, so yes. You can send me patches to fix the problem, as
>> > I would recommend :)
>>
>> Can I send you a 10 patch series (or 9 if you apply the patch in this
>> thread)? The changes I have that fix that are towards the end. The
>> problem is a lot of my changes rely on the patch sent in this thread
>> and one that follows it, so to avoid any conflicts it is easiest (at
>> least for me :) to just send the whole series. They have been tested
>> and pretty much leave usbip in the state it was originally in.
>
> I don't know, I would have to see the patches. Please send them on.
You probably won't like it; there is quite a bit of change. Maybe
reverting that patch would be easiest for both of us. I will send them
anyway, so you can make the decision.
-matt
--
GPG-Key: 9AFE00EA
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists