On Tue, Oct 04, 2011 at 05:14:49PM +1100, Stephen Rothwell wrote: > 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, commit 8a3a3c85e44d ("mac80211: pass vif param to conf_tx() > callback") from the wireless tree and several commits from the staging > tree. > > I fixed it up (just removed the forward declarions that were changed by > the former commits) and can carry the fix as necessary. Thanks, that sounds correct. Aren't you happy my trees are back now? :) greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html