Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:43328 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678Ab3FDWAQ (ORCPT ); Tue, 4 Jun 2013 18:00:16 -0400 Date: Tue, 4 Jun 2013 17:53:20 -0400 From: "John W. Linville" To: linux-wireless@vger.kernel.org Cc: Johannes Berg , Samuel Ortiz , Gustavo Padovan , Luciano Coelho Subject: Re: wireless tree rebased (from 5/28), Broadcom bits dropped Message-ID: <20130604215320.GC11199@tuxdriver.com> (sfid-20130605_000022_753591_1B1E52D0) References: <20130604212602.GB11199@tuxdriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20130604212602.GB11199@tuxdriver.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 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.