From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754908AbcLBS67 (ORCPT ); Fri, 2 Dec 2016 13:58:59 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:38956 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752243AbcLBS65 (ORCPT ); Fri, 2 Dec 2016 13:58:57 -0500 Date: Fri, 02 Dec 2016 13:58:55 -0500 (EST) Message-Id: <20161202.135855.9272188465887066.davem@davemloft.net> To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: pull-request: wireless-drivers-next 2016-12-01 From: David Miller In-Reply-To: <877f7jsdmm.fsf@kamboji.qca.qualcomm.com> References: <877f7jsdmm.fsf@kamboji.qca.qualcomm.com> X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Fri, 02 Dec 2016 09:59:33 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kalle Valo Date: Thu, 01 Dec 2016 20:33:37 +0200 > here's another pull request for net-next. Nothing special to mention > about, the details are in the signed tag below. > > This time there's a trivial conflict in > drivers/net/wireless/ath/ath10k/mac.c: > > <<<<<<< HEAD > ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); > ======= > ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); >>>>>>>> d5fb3a138048798ce4cc4b4ced47d07d1794c577 > > We want to have both flags enabled in ath10k. > > I'm planning to submit at least one more pull request, if Linus gives us > one more week I might send even two. For example there are patches to > convert wcn36xx to use the real SMD bus subsystem but they depend on few > arm-soc patches. I'll send a separate email about that, they are not > part of this pull request. > > Please let me know if there are any problems. Pulled, thanks so much for the heads up about the ath10k merge conflict.