linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Hilman <khilman@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: linux-next: build failure after merge of the amlogic tree
Date: Thu, 09 Jun 2016 15:43:48 -0700	[thread overview]
Message-ID: <7hziquc7a3.fsf@baylibre.com> (raw)
In-Reply-To: <20160606140231.394f5db7@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 6 Jun 2016 14:02:31 +1000")

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Kevin,
>
> On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote:
>>
>> Not forgotten, but merged through Philip's reset tree, which I thought
>> was already in linux-next.  Sorry about that.
>
> It may well be, but we dislike implicit dependencies between trees ...
> it makes the merge order matter :-(  What you should have is a common
> non-rebasing branch that both trees merge.

Yup, I'll work this out with Philipp.

Kevin

  reply	other threads:[~2016-06-09 22:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-05 23:55 linux-next: build failure after merge of the amlogic tree Stephen Rothwell
2016-06-06  3:40 ` Kevin Hilman
2016-06-06  4:02   ` Stephen Rothwell
2016-06-09 22:43     ` Kevin Hilman [this message]
2020-02-16 21:25 Stephen Rothwell

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=7hziquc7a3.fsf@baylibre.com \
    --to=khilman@baylibre.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=narmstrong@baylibre.com \
    --cc=p.zabel@pengutronix.de \
    --cc=sfr@canb.auug.org.au \
    /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 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).