* linux-next: manual merge of the staging tree with the net and wireless trees
@ 2011-10-04 6:14 Stephen Rothwell
2011-10-04 15:25 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-10-04 6:14 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Eliad Peller, John W. Linville,
David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the staging tree with the net and wireless trees
2011-10-04 6:14 linux-next: manual merge of the staging tree with the net and wireless trees Stephen Rothwell
@ 2011-10-04 15:25 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2011-10-04 15:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Eliad Peller, John W. Linville,
David Miller, netdev
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-04 15:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-04 6:14 linux-next: manual merge of the staging tree with the net and wireless trees Stephen Rothwell
2011-10-04 15:25 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).