From: Jason Cooper <jason@lakedaemon.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: andrew@lunn.ch, gregory.clement@free-electrons.com,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Mon, 19 Aug 2013 16:57:36 -0400 [thread overview]
Message-ID: <20130819205736.GA13964@titan.lakedaemon.net> (raw)
In-Reply-To: <20130819160537.1eeb0a9ebc269def138e016b@canb.auug.org.au>
Hi Stephen,
On Mon, Aug 19, 2013 at 04:05:37PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the mvebu tree got conflicts in various files
> between merges and commits in the arm-soc tree and merges in the mvebu
> tree.
I'm afraid I'm a bit lost...
> These merges/commits in the mvebu tree appear to be from a previous
> version of the arm-soc tree that the mvebu tree has been rebased upon.
> Please don't do that - the arm-soc tree as a whole is not stable.
I didn't do anything different from the other times I built for-next.
Could you give me a specific example when you build linux-next again?
I'll certainly try to avoid it in the future, but it'll be easier if I
know what 'it' is. ;-)
I'll not change for-next today, and we'll see how it goes.
thx,
Jason.
WARNING: multiple messages have this Message-ID (diff)
From: jason@lakedaemon.net (Jason Cooper)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Mon, 19 Aug 2013 16:57:36 -0400 [thread overview]
Message-ID: <20130819205736.GA13964@titan.lakedaemon.net> (raw)
In-Reply-To: <20130819160537.1eeb0a9ebc269def138e016b@canb.auug.org.au>
Hi Stephen,
On Mon, Aug 19, 2013 at 04:05:37PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the mvebu tree got conflicts in various files
> between merges and commits in the arm-soc tree and merges in the mvebu
> tree.
I'm afraid I'm a bit lost...
> These merges/commits in the mvebu tree appear to be from a previous
> version of the arm-soc tree that the mvebu tree has been rebased upon.
> Please don't do that - the arm-soc tree as a whole is not stable.
I didn't do anything different from the other times I built for-next.
Could you give me a specific example when you build linux-next again?
I'll certainly try to avoid it in the future, but it'll be easier if I
know what 'it' is. ;-)
I'll not change for-next today, and we'll see how it goes.
thx,
Jason.
next prev parent reply other threads:[~2013-08-19 20:58 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-19 6:05 linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell
2013-08-19 6:05 ` Stephen Rothwell
2013-08-19 6:05 ` Stephen Rothwell
2013-08-19 20:57 ` Jason Cooper [this message]
2013-08-19 20:57 ` Jason Cooper
2013-08-19 21:09 ` Olof Johansson
2013-08-19 21:09 ` Olof Johansson
2013-08-19 21:09 ` Olof Johansson
2013-08-19 21:38 ` Jason Cooper
2013-08-19 21:38 ` Jason Cooper
2013-08-19 21:38 ` Jason Cooper
2014-02-26 1:46 Stephen Rothwell
2014-02-26 1:46 ` Stephen Rothwell
2014-02-26 1:46 ` Stephen Rothwell
2014-03-18 0:21 Stephen Rothwell
2014-03-18 0:21 ` Stephen Rothwell
2014-03-18 0:21 ` Stephen Rothwell
2014-05-06 1:07 Stephen Rothwell
2014-05-06 1:07 ` Stephen Rothwell
2014-05-06 1:07 ` Stephen Rothwell
2014-05-06 1:13 ` Olof Johansson
2014-05-06 1:13 ` Olof Johansson
2014-05-06 1:13 ` Olof Johansson
2015-01-13 0:20 Stephen Rothwell
2015-01-13 0:20 ` Stephen Rothwell
2015-01-13 0:20 ` Stephen Rothwell
2015-01-13 1:05 ` Andrew Lunn
2015-01-13 1:05 ` Andrew Lunn
2015-10-31 23:35 Stephen Rothwell
2015-10-31 23:35 ` Stephen Rothwell
2015-10-31 23:35 ` Stephen Rothwell
2015-12-02 11:12 Mark Brown
2015-12-02 11:12 ` Mark Brown
2015-12-02 11:12 ` Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:21 ` Arnd Bergmann
2015-12-02 11:21 ` Arnd Bergmann
2015-12-02 13:49 ` Gregory CLEMENT
2015-12-02 13:49 ` Gregory CLEMENT
2015-12-02 15:09 ` Arnd Bergmann
2015-12-02 15:09 ` Arnd Bergmann
2016-02-17 23:33 Stephen Rothwell
2016-02-17 23:33 ` Stephen Rothwell
2016-02-17 23:33 ` Stephen Rothwell
2016-04-13 23:29 Stephen Rothwell
2016-04-13 23:29 ` Stephen Rothwell
2016-04-13 23:29 ` Stephen Rothwell
2017-04-11 22:34 Stephen Rothwell
2017-04-11 22:34 ` Stephen Rothwell
2017-04-12 8:23 ` Gregory CLEMENT
2017-04-12 8:23 ` Gregory CLEMENT
2017-04-12 10:51 ` Stephen Rothwell
2017-04-12 10:51 ` Stephen Rothwell
2018-05-16 22:47 Stephen Rothwell
2018-05-16 22:47 ` Stephen Rothwell
2022-05-09 23:41 Stephen Rothwell
2022-05-09 23:41 ` Stephen Rothwell
2022-05-10 13:59 ` Krzysztof Kozlowski
2022-05-10 13:59 ` Krzysztof Kozlowski
2022-05-10 14:42 ` Arnd Bergmann
2022-05-10 14:42 ` Arnd Bergmann
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=20130819205736.GA13964@titan.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=gregory.clement@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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 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.