Messages in this thread | | | Date | Thu, 17 Apr 2014 14:31:37 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the staging.current tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in drivers/staging/rtl8723au/core/rtw_ieee80211.c, drivers/staging/rtl8723au/core/rtw_mlme_ext.c, drivers/staging/rtl8723au/core/rtw_p2p.c and drivers/staging/rtl8723au/core/rtw_wlan_util.c between commit f5d197b614d8 ("staging: rtl8723au: Fix buffer overflow in rtw_get_wfd_ie ()") from the staging.current tree and various commits from the staging tree.
I fixed it up (I just use dthe version from the staging tree) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |