From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@codeaurora.org>,
Wireless <linux-wireless@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sara Sharon <sara.sharon@intel.com>,
Johannes Berg <johannes.berg@intel.com>,
Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with the net-next tree
Date: Fri, 2 Dec 2016 11:03:13 +1100 [thread overview]
Message-ID: <20161202110313.2104919e@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/ath/ath10k/mac.c
between commit:
f3fe4e93dd63 ("mac80211: add a HW flag for supporting HW TX fragmentation")
from the net-next tree and commit:
ff32eeb86aa1 ("ath10k: advertize hardware packet loss mechanism")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/ath/ath10k/mac.c
index 717b2fad9a8a,db6ddf974d1d..000000000000
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -8005,7 -7993,7 +7993,8 @@@ int ath10k_mac_register(struct ath10k *
ieee80211_hw_set(ar->hw, WANT_MONITOR_VIF);
ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
+ ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);
+ ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK);
if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))
ieee80211_hw_set(ar->hw, SW_CRYPTO_CONTROL);
next reply other threads:[~2016-12-02 0:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 0:03 Stephen Rothwell [this message]
2016-12-02 5:08 ` linux-next: manual merge of the wireless-drivers-next tree with the net-next tree Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2016-07-11 2:06 Stephen Rothwell
2016-07-11 2:06 ` Stephen Rothwell
2016-07-11 8:03 ` Kalle Valo
2016-07-11 8:03 ` Kalle Valo
2016-05-16 0:16 Stephen Rothwell
2016-05-16 0:16 ` Stephen Rothwell
2016-05-16 13:10 ` Kalle Valo
2016-05-16 13:10 ` Kalle Valo
2016-05-16 13:37 ` Coelho, Luciano
2016-05-16 13:37 ` Coelho, Luciano
2016-05-16 13:58 ` Kalle Valo
2016-05-16 13:58 ` Kalle Valo
2016-05-16 15:09 ` David Miller
2015-05-11 2:33 Stephen Rothwell
2015-05-11 2:33 ` Stephen Rothwell
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=20161202110313.2104919e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rmanohar@qti.qualcomm.com \
--cc=sara.sharon@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.