* wireless tree status
@ 2013-11-24 20:54 Johannes Berg
2013-11-25 8:51 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2013-11-24 20:54 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless
John,
were you planning to pull 3.13-rc1 into wireless.git?
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: wireless tree status
2013-11-24 20:54 wireless tree status Johannes Berg
@ 2013-11-25 8:51 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2013-11-25 8:51 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless
On Sun, 2013-11-24 at 21:54 +0100, Johannes Berg wrote:
> John,
>
> were you planning to pull 3.13-rc1 into wireless.git?
Same question for wireless-next btw, but I think you should definitely
pull it in there for the genetlink changes I made through the net tree
recently. Otherwise we'll get conflicts in nl80211 for everything. In
fact even in wireless.git I believe we'd get conflicts but those are
less interesting (some bug fixes I have pending conflict slightly with
the genl changes).
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-25 8:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-24 20:54 wireless tree status Johannes Berg
2013-11-25 8:51 ` Johannes Berg
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).