Messages in this thread | | | From | Kevin Hilman <> | Subject | Re: linux-next: build failure after merge of the amlogic tree | Date | Thu, 09 Jun 2016 15:43:48 -0700 |
| |
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
| |