Messages in this thread | | | Date | Thu, 6 Oct 2011 15:58:10 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the net tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commit 37a41b4affa3 ("mac80211: add ieee80211_vif param to tsf functions") from the net tree and commit 3956b4a2ddb0 ("staging: brcm80211: remove locking macro definitions") from the staging tree.
I fixed it up (which essentially means I used the staging tree version with one small change to the brcms_ops_conf_tx prototype) and can carry the fixes as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature] | |