Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33802 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751671AbaCTUDZ (ORCPT ); Thu, 20 Mar 2014 16:03:25 -0400 Date: Thu, 20 Mar 2014 13:05:29 -0700 From: Greg Kroah-Hartman To: Larry Finger Cc: Peter Wu , John W Linville , Chaoming_Li , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, lekensteyn@gmail.com Subject: Re: [PATCH 0/3] rtlwifi (and staging rtl8821ae) cleanups Message-ID: <20140320200529.GA8009@kroah.com> (sfid-20140320_210349_168499_6D749ABE) References: <1395341544-21464-1-git-send-email-peter@lekensteyn.nl> <532B4606.3030303@lwfinger.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <532B4606.3030303@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Mar 20, 2014 at 02:48:22PM -0500, Larry Finger wrote: > On 03/20/2014 01:52 PM, Peter Wu wrote: > >Hi, > > > >The first patch of these series was NAKed some weeks ago because it would > >conflict with the new rtl8723be driver. Since those changes are in wireless-next > >now, I have adjusted that patch to take care of rtl8723be. > > > >The other two patches to the staging driver is similar to the rtlwifi changes. > >I am not sure who to send these two patches to. Greg is the staging maintainer, > >but John takes wireless patches, so I have included both of you. > > > >All patches are compile-tested on top of v3.14-rc2-938-g67b3bd4. > > > >I also found the following (unrelated to my patches) warning while compiling the > >staging driver, perhaps it needs a closer look? > > Peter, > > Your Patch 1/3 applies cleanly and I think it is OK, but if you are going to > do cleanups on the wireless tree, you should be working from the latest > version of wireless-testing git repo. We are on 3.14-rc7 and there are > several recent commits that might have conflicted. > > As for the changes to staging/rtl8821ae (No. 2 & 3), once Linus starts the > merge that will precede the release of 3.15-rc2, the entire code for > rtl8821ae will be replaced. A cleaned-up version was nearly ready for the > regular wireless tree in time to make 3.15, but it did not get enough > testing. As a result, that driver will be in testing for one more cycle. By > 3.16, it should reside in the regular tree and be out of staging. > > Pushing patches that affect both the regular tree and staging is complicated > and should be avoided whenever possible. Yes, for now, I'm going to ignore these patches (especially as my trees are now closed for "cleanup" patches for 3.15-rc1, and wait for this all to settle down before accepting anything else for this driver. thanks, greg k-h