From: David Miller <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
Date: Fri, 02 Dec 2016 13:58:55 -0500 (EST) [thread overview]
Message-ID: <20161202.135855.9272188465887066.davem@davemloft.net> (raw)
In-Reply-To: <877f7jsdmm.fsf@kamboji.qca.qualcomm.com>
From: Kalle Valo <kvalo@codeaurora.org>
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.
prev parent reply other threads:[~2016-12-02 18:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 18:33 pull-request: wireless-drivers-next 2016-12-01 Kalle Valo
2016-12-02 18:58 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161202.135855.9272188465887066.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).