From: David Miller <davem@davemloft.net>
To: luciano.coelho@nokia.com
Cc: linville@tuxdriver.com, mcgrof@gmail.com, kalle.valo@iki.fi,
linux-wireless@vger.kernel.org
Subject: Re: Revised wireless tree management practices
Date: Mon, 14 Dec 2009 04:40:27 -0800 (PST) [thread overview]
Message-ID: <20091214.044027.35344301.davem@davemloft.net> (raw)
In-Reply-To: <4B263063.4030000@nokia.com>
From: Luciano Coelho <luciano.coelho@nokia.com>
Date: Mon, 14 Dec 2009 14:32:35 +0200
> Now it's my turn to ask a question... What happens in the case when
> there is an API change, say, in mac80211 that requires changes in a
> few different drivers? Those changes are usually done in a single
> patch that changes both the API and the affected drivers in one go.
> In this case we will end up having to rebase our own trees.
No you won't need to rebase, that's the last thing you should do.
When there is a conflict to resolve or a situation like the one you
describe, you simply pull John's tree into your's.
next prev parent reply other threads:[~2009-12-14 12:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-09 21:10 Revised wireless tree management practices John W. Linville
2009-12-10 0:51 ` David Miller
2009-12-10 13:38 ` Kalle Valo
2009-12-10 13:47 ` John W. Linville
2009-12-10 14:04 ` Kalle Valo
2009-12-10 14:31 ` Luis R. Rodriguez
2009-12-10 14:37 ` John W. Linville
2009-12-10 14:53 ` Luis R. Rodriguez
2009-12-10 15:03 ` John W. Linville
2009-12-10 16:14 ` Luis R. Rodriguez
2009-12-10 16:25 ` John W. Linville
2009-12-14 12:32 ` Luciano Coelho
2009-12-14 12:40 ` David Miller [this message]
2009-12-14 13:52 ` John W. Linville
2009-12-14 14:16 ` Bartlomiej Zolnierkiewicz
2009-12-14 14:26 ` John W. Linville
2009-12-14 14:59 ` Bartlomiej Zolnierkiewicz
2009-12-14 15:23 ` David Miller
2009-12-14 16:20 ` Bartlomiej Zolnierkiewicz
2009-12-14 18:03 ` David Miller
2009-12-14 18:24 ` Bartlomiej Zolnierkiewicz
2009-12-14 18:41 ` David Miller
2009-12-14 19:16 ` Bartlomiej Zolnierkiewicz
2009-12-14 19:23 ` David Miller
2009-12-14 19:42 ` Bartlomiej Zolnierkiewicz
2009-12-14 19:46 ` David Miller
2009-12-14 20:09 ` Bartlomiej Zolnierkiewicz
2009-12-14 15:19 ` David Miller
2009-12-14 16:18 ` Bartlomiej Zolnierkiewicz
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=20091214.044027.35344301.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=kalle.valo@iki.fi \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=luciano.coelho@nokia.com \
--cc=mcgrof@gmail.com \
/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).