lkml.org 
[lkml]   [2009]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: pull request: wireless-2.6 2009-12-18
From
From: "John W. Linville" <linville@tuxdriver.com>
Date: Sun, 20 Dec 2009 08:38:00 -0500

> On Sun, Dec 20, 2009 at 12:17:36AM -0800, David Miller wrote:
>> From: "John W. Linville" <linville@tuxdriver.com>
>> Date: Fri, 18 Dec 2009 16:19:45 -0500
>>
>> > Please let me know if there are problems!
>>
>> Your tree is based upon Linus's not net-2.6
>> so when I pulled I got a lot of unrelated
>> commits.
>>
>> Please fix this, thanks.
>
> It's based on 2.6.33-rc1. Are you not going to pull that into net-2.6?

Why in the world should I? There are no conflicts to resolve
that I know of.

And if there are no conflicts to resolve, pulling in Linus's
tree just makes future pulls into his tree more ugly.

This is pretty standard practice, but in any event you shouldn't ever
care.

You should simply always work against net-2.6, there is no reason to
work against any other tree.

This is a pretty fundamental thing, I don't know why you based against
Linus's tree instead of net-2.6. Now you have to rebase already :-/



\
 
 \ /
  Last update: 2009-12-21 03:31    [from the cache]
©2003-2011 Jasper Spaans