From: sboyd@codeaurora•org (Stephen Boyd)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] Allwinner DT changes for 4.4, round 3
Date: Mon, 2 Nov 2015 11:41:57 -0800 [thread overview]
Message-ID: <20151102194157.GR19782@codeaurora.org> (raw)
In-Reply-To: <CAOesGMhb4Y6UQ=OqT8fVZaBP6pA1XCsHD5zG0HmKyzosd5F0ZQ@mail.gmail.com>
On 11/02, Olof Johansson wrote:
> On Mon, Nov 2, 2015 at 11:19 AM, Stephen Boyd <sboyd@codeaurora•org> wrote:
> > On 10/31, Olof Johansson wrote:
> >> On Mon, Oct 26, 2015 at 3:34 AM, Maxime Ripard
> >> >
> >> > Gaah, sorry...
> >> >
> >> >> I've merged this in now. Note that this has resulted in a tree that won't
> >> >> misect cleanly, since having the clk contents merged instead of used as a base
> >> >> for the dt branch means that you could end up in a bisect state that has the DT
> >> >> branch but not the clk branch.
> >> >
> >> > Even if it has been merged before the DT patches have been applied?
> >> > That's not really what I'd expect from bisect :/
> >>
> >> Yeah, due to the way bisect works, the only way to guarantee
> >> bisectability is if you base the DT branch on top of the clk branch
> >> when you build it. Otherwise the bisect can come down the path of only
> >> having the DT contents not the clk contents.
> >
> > Why can't the dts changes be applied directly on top of the
> > branch that's in the clk tree and then sent off to arm-soc? The
> > git merge && git commit technique also works, but it introduces
> > an unnecessary merge commit into the history.
>
> "base the DT branch on top of the clk branch" is exactly that, isn't it?
>
Yes. I mostly wanted to point out that you don't need to do the
git merge part when building that branch.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2015-11-02 19:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 18:07 [GIT PULL] Allwinner DT changes for 4.4, round 3 Maxime Ripard
2015-10-23 20:41 ` Arnd Bergmann
2015-10-23 20:55 ` Arnd Bergmann
2015-10-25 20:13 ` Maxime Ripard
2015-10-26 1:07 ` Olof Johansson
2015-10-26 1:46 ` Chen-Yu Tsai
2015-10-26 5:48 ` Olof Johansson
2015-10-26 10:34 ` Maxime Ripard
2015-10-31 9:42 ` Olof Johansson
2015-11-02 19:19 ` Stephen Boyd
2015-11-02 19:35 ` Olof Johansson
2015-11-02 19:41 ` Stephen Boyd [this message]
2015-11-09 0:04 ` Maxime Ripard
2015-11-09 21:14 ` Stephen Boyd
2015-10-26 10:26 ` Michael Turquette
2015-10-26 0:40 ` Olof Johansson
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=20151102194157.GR19782@codeaurora.org \
--to=sboyd@codeaurora$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox