lkml.org 
[lkml]   [2010]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: pull request: wireless-2.6 2010-02-10
From
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 10 Feb 2010 15:32:28 -0500

> On Wed, Feb 10, 2010 at 12:25:40PM -0800, David Miller wrote:
>> From: "John W. Linville" <linville@tuxdriver.com>
>> Date: Wed, 10 Feb 2010 15:19:54 -0500
>>
>> > On Wed, Feb 10, 2010 at 11:36:58AM -0800, David Miller wrote:
>> >> From: Johannes Berg <johannes@sipsolutions.net>
>> >> Date: Wed, 10 Feb 2010 20:15:37 +0100
>> >>
>> >> > It was intentional -- that sdev doesn't even have an irq member, but
>> >> > nobody ever noticed because of the wrong ifdef.
>> >>
>> >> Ok, then this needs to be explained in the commit message.
>> >
>> > OK...mind if I just revert the current version and ask Michael to
>> > resubmit with an appropriate changelog entry?
>>
>> Have you pulled this tree into others already? Why not
>> just pop out the commit and fix it's commit message, then
>> reapply?
>>
>> Having the revert commit in there is really stupid just for this.
>
> I have it pulled into wireless-next-2.6 to fix a merge conflict (from
> a latter commit). It is also pulled into wireless-testing but that
> is obviously less of an issue.

Ok, forget this, I'll just pull it in as-is.

But we have to have a better system to handle cases where I
don't like a change you're asking me to pull in and I want
changes made to it.

If you want to push stuff into wireless-next-2.6, get it into
my tree first. That way we can tidy things up before it
propagates.

Thanks.


\
 
 \ /
  Last update: 2010-02-10 21:37    [from the cache]
©2003-2011 Jasper Spaans