Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]:33918 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949AbbCBPIq (ORCPT ); Mon, 2 Mar 2015 10:08:46 -0500 From: Kalle Valo To: Arend van Spriel Cc: "Fu\, Zhonghui" , Pat Erley , , Franky Lin , , , , , , , , , "linux-kernel\@vger.kernel.org" Subject: Re: [PATCH v3] brcmfmac: avoid duplicated suspend/resume operation References: <54DC1D7D.5050407@linux.intel.com> <54E0072D.3020802@linux.intel.com> <54E01209.7010300@erley.org> <54E05961.7000201@broadcom.com> <878ufzi5s3.fsf@kamboji.qca.qualcomm.com> <54E19DA1.4030407@linux.intel.com> <54E1B9F4.6090302@broadcom.com> <54F02271.5070202@linux.intel.com> <54F03412.2050902@broadcom.com> Date: Mon, 02 Mar 2015 17:08:37 +0200 In-Reply-To: <54F03412.2050902@broadcom.com> (Arend van Spriel's message of "Fri, 27 Feb 2015 10:08:34 +0100") Message-ID: <874mq3bfnu.fsf@kamboji.qca.qualcomm.com> (sfid-20150302_160907_532643_27F6443B) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: Arend van Spriel writes: >> Now that there is not 3.20 version. My understanding is that this >> patch will be in linus' tree 4.1-rc1, right? > > Yes. It will go into linux-next first, which you can consider to be an > incubator where all stuff for the next release is integrated. Stuff > will be added there until 4.0 is released. At that moment the merge > window starts which moves all the stuff from linux-next into the > mainline linux repo to prepare 4.1-rc1. > > Now regarding your patch I have to give a heads up. Our pending > patches have been applied by Kalle and includes similar fix. Yeah, Zhonghui's patch doesn't apply anymore. There is similar code in wireless-drivers-next but still a bit different. So what should we do? Is the driver ok now? -- Kalle Valo