From: Kalle Valo <kvalo@codeaurora.org>
To: David Miller <davem@davemloft.net>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2018-12-20
Date: Thu, 20 Dec 2018 20:22:17 +0200 [thread overview]
Message-ID: <874lb8t5wm.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <878t0kt6tu.fsf@kamboji.qca.qualcomm.com> (Kalle Valo's message of "Thu, 20 Dec 2018 20:02:21 +0200")
+ stephen
Kalle Valo <kvalo@codeaurora.org> writes:
> here's a pull request to net-next for 4.21. More info in the signed
> below.
>
> As I have been too busy this cycle not all of these have been in
> linux-next, but most of them has been tested by the kbuild bot and the
> last few remaining patches are being tested while I write this. So I'm
> not expecting any major problems, but if you see something do let me
> know.
>
> Happy Holidays and have a great New Year :)
>
> Kalle
>
> The following changes since commit d9bbd6a1a56eccb2b1198b8f2008d622982df0a1:
>
> net: marvell: convert to DEFINE_SHOW_ATTRIBUTE (2018-12-03 17:33:44 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git tags/wireless-drivers-next-for-davem-2018-12-20
>
> for you to fetch changes up to fbbae71d374f24887d78631e50210b7110fffb84:
>
> Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git (2018-12-20 19:25:43 +0200)
BTW, when merging wireless-drivers (which is in net tree now) with
wireless-drivers-next there's one simple conflict:
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h
Please fix it by leaving all three enums in place, so something like
this:
diff --cc drivers/net/wireless/ath/ath10k/wmi.h
index 88210ddaedc4,c5a343c93013..000000000000
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@@ -205,8 -205,7 +205,9 @@@ enum wmi_service
WMI_SERVICE_SPOOF_MAC_SUPPORT,
WMI_SERVICE_TX_DATA_ACK_RSSI,
WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT,
+ WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT,
+ WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT,
+ WMI_SERVICE_THERM_THROT,
/* keep last */
WMI_SERVICE_MAX,
--
Kalle Valo
next prev parent reply other threads:[~2018-12-20 18:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 18:02 Kalle Valo
2018-12-20 18:22 ` Kalle Valo [this message]
2018-12-21 0:48 ` David Miller
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=874lb8t5wm.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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
all inboxes | Powered by JetHome®