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

Ben Greear greearb at
Wed Apr 2 17:57:21 EDT 2014

On 04/01/2014 12:42 AM, Kalle Valo wrote:
> Ben Greear <greearb at> 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?

Other wireless patches would be fine.  I just don't want all of 3.15.0-rc1,
at least until I can snapshot a 3.14 to try to stabalize.

> 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?

That sounds like a good thing to try..I'll see how that works.


> 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.

Ben Greear <greearb at>
Candela Technologies Inc

More information about the ath10k mailing list