[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <874mq3bfnu.fsf@kamboji.qca.qualcomm.com>
Date: Mon, 02 Mar 2015 17:08:37 +0200
From: Kalle Valo <kvalo@...eaurora.org>
To: Arend van Spriel <arend@...adcom.com>
Cc: "Fu\, Zhonghui" <zhonghui.fu@...ux.intel.com>,
Pat Erley <pat-lkml@...ey.org>, <brudley@...adcom.com>,
Franky Lin <frankyl@...adcom.com>, <meuleman@...adcom.com>,
<linville@...driver.com>, <pieterpg@...adcom.com>,
<hdegoede@...hat.com>, <wens@...e.org>,
<linux-wireless@...r.kernel.org>,
<brcm80211-dev-list@...adcom.com>, <netdev@...r.kernel.org>,
"linux-kernel\@vger.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3] brcmfmac: avoid duplicated suspend/resume operation
Arend van Spriel <arend@...adcom.com> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists