From: Luciano Coelho <luciano.coelho@nokia.com>
To: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: wl12xx/master branch has been reset
Date: Tue, 12 Oct 2010 23:21:22 +0300 [thread overview]
Message-ID: <1286914882.1551.18.camel@powerslave> (raw)
Hi,
I have reset the wl12xx/master branch, because there were lots of merge
conflicts to resolve and I reckoned it was not worth the trouble.
Sorry for the trouble this causes, but if you had anything on top of
this tree before I reset it, you'll have to rebase.
I'll always try to avoid this as much as possible, but in some cases it
will be necessary.
The other branches, wireless-next (which is the one feeding John's tree)
and wl12xx-next, which is the "stable" wl12xx branch, have not been
changed and are still linear.
And, in case you're wondering, the wireless-testing branch is only used
eventually, to push things to John's wireless-testing tree. You
shouldn't care about that one.
--
Cheers,
Luca.
reply other threads:[~2010-10-12 20:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1286914882.1551.18.camel@powerslave \
--to=luciano.coelho@nokia.com \
--cc=linux-wireless@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).