From: David Miller <davem@davemloft.net>
To: linville@tuxdriver.com
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: Please pull 'upstream-davem' branch of wireless-2.6
Date: Tue, 02 Oct 2007 19:01:56 -0700 (PDT) [thread overview]
Message-ID: <20071002.190156.41633562.davem@davemloft.net> (raw)
In-Reply-To: <20071003012552.GE29361@tuxdriver.com>
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 2 Oct 2007 21:25:52 -0400
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem
This doesn't pull cleanly.
Probably you used a recently cloned Linus tree, pulled
net-2.6.24 into that (and resolved the conflicts), and
then put your patches in.
Please don't do it like that, I don't want to pull from
a tree that has linus vs. net-2.6.24 conflict handling
in it. That's why I usually rebase frequently, to minimize
that as much as is humanly possible.
What you can do is figure out what linus's HEAD was at the last rebase
(basically 'origin' or parent of net-2.6.24), clone that then pull in
net-2.6.24, then add your patches.
That way I can always do a clean pull.
My pull from Jeff today was very clean, for example.
I'll add these wireless bits by hand as patches.
Thanks John.
next prev parent reply other threads:[~2007-10-03 2:01 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-03 1:25 Please pull 'upstream-davem' branch of wireless-2.6 John W. Linville
2007-10-03 1:45 ` John W. Linville
2007-10-03 2:01 ` David Miller [this message]
2007-10-03 14:10 ` John W. Linville
2007-10-03 21:52 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-01-08 19:29 John W. Linville
2008-01-09 7:36 ` David Miller
2007-12-20 15:53 John W. Linville
2007-12-20 22:38 ` John W. Linville
2007-12-21 4:04 ` David Miller
2007-12-17 20:55 John W. Linville
2007-12-18 6:57 ` David Miller
2007-12-01 2:23 John W. Linville
2007-12-01 13:54 ` Herbert Xu
2007-11-20 22:11 John W. Linville
2007-11-21 1:27 ` David Miller
2007-11-07 3:08 John W. Linville
2007-11-20 5:24 ` David Miller
2007-10-10 0:21 John W. Linville
2007-10-10 1:13 ` David Miller
2007-09-15 13:20 John W. Linville
2007-08-28 22:50 John W. Linville
2007-08-29 0:21 ` David Miller
2007-08-15 0:32 Please pull 'fixes-davem' " John W. Linville
2007-08-15 0:34 ` Please pull 'upstream-davem' " John W. Linville
2007-08-15 23:09 ` David Miller
2007-08-19 23:32 ` David Miller
2007-08-06 20:13 Please pull 'fixes-davem' " John W. Linville
[not found] ` <20070806210131.GM6442@tuxdriver.com>
2007-08-09 9:00 ` Please pull 'upstream-davem' " David Miller
2007-07-18 2:16 John W. Linville
2007-07-18 3:17 ` David Miller
2007-07-18 15:34 ` John W. Linville
2007-07-18 22:32 ` David Miller
2007-07-19 0:45 ` John W. Linville
2007-07-19 1:21 ` David Miller
2007-07-12 20:41 John W. Linville
2007-07-15 1:59 ` David Miller
2007-07-15 3:41 ` David Miller
2007-07-16 16:37 ` Andy Green
2007-07-16 16:49 ` Jiri Benc
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=20071002.190156.41633562.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--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).