Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:46638 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934348AbXEGPsw (ORCPT ); Mon, 7 May 2007 11:48:52 -0400 Message-ID: <463F4A5E.6000501@garzik.org> Date: Mon, 07 May 2007 11:48:46 -0400 From: Jeff Garzik MIME-Version: 1.0 To: Dan Williams CC: "John W. Linville" , Christoph Hellwig , linux-wireless@vger.kernel.org, marcelo@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Linus Torvalds Subject: Re: Please pull 'revert-libertas' branch of wireless-2.6 (was Re: Please pull 'libertas' branch of wireless-2.6) References: <20070227205649.GH5826@tuxdriver.com> <45E8CF5E.5090305@garzik.org> <20070303052140.GA31075@infradead.org> <20070507104117.GA31601@infradead.org> <1178539423.3032.24.camel@localhost.localdomain> <20070507141143.GB5125@tuxdriver.com> <463F443A.5000306@garzik.org> <1178552878.5760.4.camel@localhost.localdomain> In-Reply-To: <1178552878.5760.4.camel@localhost.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: Dan Williams wrote: > So, either we push it off until 2.6.23, or it gets merged as-is and we > clean it up as we go along, which we'll certainly do. Um, it was merged a while ago. That's why John's email, and my own, are discussing the revert of the driver, not the merge of the driver. The executive decision has been made. Jeff