Re: linux-next: build failure after merge of the staging tree

[Johannes Berg]

On Tue, 2017-04-18 at 15:53 +1000, Stephen Rothwell wrote:

> Caused by commit
> 
> Â 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

Oh, another new driver :)

> interacting with commit
> 
> Â 818a986e4eba ("cfg80211: move add/change interface monitor flags
> into params")
> 
> from the mac80211-next tree.
> 
> I have added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 18 Apr 2017 15:43:43 +1000
> Subject: [PATCH] staging: merge fix for add/change_virtual-intf API
> change

That looks good, evidently it doesn't care about the parameter then.

Thanks!

johannes