lkml.org 
[lkml]   [2018]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: pull-request: wireless-drivers-next 2018-12-20
Date
+ 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

\
 
 \ /
  Last update: 2018-12-20 19:23    [W:0.048 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site