Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Stephen Rothwell Newsgroups: linux.kernel Subject: linux-next: build failure after merge of the staging tree Date: Tue, 18 Apr 2017 08:00:03 +0200 Message-ID: Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1492494828; bh=bc+ExKICvX9Ui81h4tbbL0pYbCdtcYtUG39CsEuzaB4=; h=Date:From:To:Cc:Subject:From; b=JS8io8BNyoCMXnH8LuNCT86C8SehervqE16lDtw9UsGNfjiCiJUxFK0c0iMNsvXxW 9ovBRxxHWxl3+W45P+7VXJ1aC3ByGfdwn7KIVQPFAeJJZsVjWQjLK790w6456vuD4P KCyBaNa0NX+t+9H8KO8FcvKv0RVbfj5winDLN34poArLcrFoNEMQ4Q+S3PnZef1c25 FNjCiXETixdAnlQQRoJdKQExHpuKWTrpAZ22Pu4z2YGH0YGwRzm0QtYuNgFGW9uuMx aqu2Qk4NZLWnB6L9QGlMz6gBQCsF7zpWIE7MpvkwEGm93uFb5A+G+yIVuPK8Iw3cUL 4PO/wIke9hRDQ== MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 63 Organization: linux.* mail to news gateway X-Original-Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans de Goede X-Original-Date: Tue, 18 Apr 2017 15:53:48 +1000 X-Original-Message-ID: <20170418155348.69ee48c4@canb.auug.org.au> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1625040 Hi all, After merging the staging tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3426:25: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .change_virtual_intf = cfg80211_rtw_change_iface, ^ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3426:25: note: (near initialization for 'rtw_cfg80211_ops.change_virtual_intf') drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3445:22: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .add_virtual_intf = cfg80211_rtw_add_virtual_intf, ^ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3445:22: note: (near initialization for 'rtw_cfg80211_ops.add_virtual_intf') Caused by commit 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi 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 Date: Tue, 18 Apr 2017 15:43:43 +1000 Subject: [PATCH] staging: merge fix for add/change_virtual-intf API change Signed-off-by: Stephen Rothwell --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index 52aa65bfd890..f17f4fbd3396 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1310,7 +1310,7 @@ extern int netdev_open(struct net_device *pnetdev); static int cfg80211_rtw_change_iface(struct wiphy *wiphy, struct net_device *ndev, - enum nl80211_iftype type, u32 *flags, + enum nl80211_iftype type, struct vif_params *params) { enum nl80211_iftype old_type; @@ -2711,7 +2711,7 @@ static struct wireless_dev * struct wiphy *wiphy, const char *name, unsigned char name_assign_type, - enum nl80211_iftype type, u32 *flags, struct vif_params *params) + enum nl80211_iftype type, struct vif_params *params) { int ret = 0; struct net_device* ndev = NULL; -- 2.11.0 -- Cheers, Stephen Rothwell