linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: linux-wireless@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
	Luciano Coelho <coelho@ti.com>
Subject: Re: wireless tree rebased (from 5/28), Broadcom bits dropped
Date: Tue, 4 Jun 2013 17:53:20 -0400	[thread overview]
Message-ID: <20130604215320.GC11199@tuxdriver.com> (raw)
In-Reply-To: <20130604212602.GB11199@tuxdriver.com>

I messed this up too -- bad day...

If you pulled in between the earlier message and this one, please
do so again.  If you saw this message before taking any action to
clean-up my mess, then you are OK.

John

On Tue, Jun 04, 2013 at 05:26:03PM -0400, John W. Linville wrote:
> All,
> 
> Due to my poor judgment in accepting the brcmfmac/brcmsmac series,
> I've made a mess of the wireless tree.  To fix it, I have rebased from
> before that series was applied.  I'm sure there were other potential
> courses of action, but this is the one I chose...
> 
> If you maintain a tree that pulls from wireless.git (and has done
> so within the past week), then you will need to rebase as well.
> This is particularly true if you wish for me to pull from your tree
> in the future.
> 
> I sincerely apologize for the inconvenience.  I hope that it won't
> be happening again anytime soon (if at all).
> 
> John
> -- 
> John W. Linville		Someday the world will need a hero, and you
> linville@tuxdriver.com			might be all we have.  Be ready.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

  reply	other threads:[~2013-06-04 22:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-04 21:26 wireless tree rebased (from 5/28), Broadcom bits dropped John W. Linville
2013-06-04 21:53 ` John W. Linville [this message]
2013-06-05  6:59   ` Johannes Berg
2013-06-05 14:37     ` John W. Linville
2013-06-05 16:40       ` Samuel Ortiz
2013-06-05 16:49       ` Gustavo Padovan
2013-06-05 16:57       ` Arend van Spriel
2013-06-05 20:19       ` John W. Linville

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=20130604215320.GC11199@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=coelho@ti.com \
    --cc=gustavo.padovan@collabora.co.uk \
    --cc=johannes.berg@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=sameo@linux.intel.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).