Clean-ish rebase on top of 3.14.0 (final)?

[Kalle Valo]

Ben Greear <greearb at candelatech.com> writes:

> Kalle:  In case you end up with your tree in a clean rebase
> on stock 3.14.0 (or as clean as is reasonable), could you let
> us know and give us a bit of time before pulling down more
> upstream stuff?
>
> The reason is that I would like to freeze a 3.14 kernel with whatever
>ath10k patches are currently in your tree and attempt to stabalize
>it...

Do you mean 3.14 plus only ath10k patches? Or are you willing to take
other wireless patches as well?

Basically I have two branches in my ath.git:

o ath-next: wireless-next + latest ath10k patches

o master: wireless-testing + ath-next (= latest ath10k patches)

I only merge latest wireless-next to ath-next seldomly, usually once
every 1-2 months. But I merge wireless-testing to master branch at least
weekly.

One idea would be that you merge 3.14 tag with ath-next. That way you
get latest wireless code on top of 3.14. Would that work?

I'm planning to merge wireless-next to ath-next once John opens his
trees again, which usually happens just after the merge window is
closed.

-- 
Kalle Valo