Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:48090 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754744AbcEQQVb (ORCPT ); Tue, 17 May 2016 12:21:31 -0400 Date: Tue, 17 May 2016 12:21:29 -0400 (EDT) Message-Id: <20160517.122129.77809623717937332.davem@davemloft.net> (sfid-20160517_182136_619388_A4847DDD) To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, luciano.coelho@intel.com, emmanuel.grumbach@intel.com Subject: Re: pull-request: wireless-drivers-next 2016-05-13 From: David Miller In-Reply-To: <8737ph89rd.fsf@kamboji.qca.qualcomm.com> References: <87wpmu87ns.fsf@kamboji.qca.qualcomm.com> <87futi858q.fsf@kamboji.qca.qualcomm.com> <8737ph89rd.fsf@kamboji.qca.qualcomm.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Kalle Valo Date: Tue, 17 May 2016 09:43:34 +0300 > I noticed that you had marked this as Superseded in pathwork[1]. I was > actually hoping that you would pull this with the instructions how to > fix the conflict. But do you actually want me to resubmit the pull > request? Or something else? > > [1] https://patchwork.ozlabs.org/patch/621953/ My impression is that you need to make adjustments to fix the merge error I made the other day, and that a new pull request would show up with that corrected. There is no rush, whenever you submit it I'll still take it. THanks.