From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull request: wireless-2.6 2009-12-18
Date: Sun, 20 Dec 2009 22:07:38 -0500 [thread overview]
Message-ID: <20091221030738.GA2398@tuxdriver.com> (raw)
In-Reply-To: <20091220.182910.226760127.davem@davemloft.net>
On Sun, Dec 20, 2009 at 06:29:10PM -0800, David Miller wrote:
> 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 :-/
My mistake! For some reason I just thought that pulling from -rc1 was
your normal practice -- now I can't figure what gave me that idea...
Anyway, might as well have one more rebase now. I'll straighten-out
my trees tomorrow morning and resubmit.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2009-12-21 3:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-18 21:19 pull request: wireless-2.6 2009-12-18 John W. Linville
[not found] ` <20091218211945.GC2828-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2009-12-20 1:36 ` John W. Linville
2009-12-20 8:17 ` David Miller
2009-12-20 13:38 ` John W. Linville
[not found] ` <20091220133800.GA4700-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2009-12-21 2:29 ` David Miller
2009-12-21 3:07 ` John W. Linville [this message]
2009-12-21 3:16 ` David Miller
2009-12-21 19:16 ` pull request: wireless-2.6 2009-12-21 John W. Linville
2009-12-21 20:14 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091221030738.GA2398@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).