All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Greear <greearb@candelatech.com>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: ath10k <ath10k@lists.infradead.org>
Subject: Re: Clean-ish rebase on top of 3.14.0 (final)?
Date: Wed, 02 Apr 2014 14:57:21 -0700	[thread overview]
Message-ID: <533C87C1.2090908@candelatech.com> (raw)
In-Reply-To: <87ioqtsdgt.fsf@kamboji.qca.qualcomm.com>

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

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.

Thanks,
Ben

>
> 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@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

      reply	other threads:[~2014-04-02 21:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-31 16:25 Clean-ish rebase on top of 3.14.0 (final)? Ben Greear
2014-04-01  7:42 ` Kalle Valo
2014-04-02 21:57   ` Ben Greear [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=533C87C1.2090908@candelatech.com \
    --to=greearb@candelatech.com \
    --cc=ath10k@lists.infradead.org \
    --cc=kvalo@qca.qualcomm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.