From: Olof Johansson <olof@lixom.net>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] Renesas ARM-based SoC v3.9
Date: Thu, 24 Jan 2013 03:35:23 +0000 [thread overview]
Message-ID: <CAOesGMgegSh4rmdV3d7zMyN=JJXr9i6hQCNCeH49Z=FwWzotNw@mail.gmail.com> (raw)
In-Reply-To: <20130122091924.GB11708@linux-sh.org>
On Tue, Jan 22, 2013 at 1:19 AM, Paul Mundt <lethal@linux-sh.org> wrote:
> On Tue, Jan 22, 2013 at 12:21:23AM -0800, Olof Johansson wrote:
>> On Mon, Jan 21, 2013 at 04:31:43PM +0100, Laurent Pinchart wrote:
>> > Sure, we could push 1-6 through the ARM tree, wait until it reaches mainline,
>> > then push 7 through the pinctrl tree, wait until it reaches mainline, push 8
>> > through the SH tree and 9 through the ARM tree, wait until they reach
>> > mainline, and finally push 10 through the pinctrl tree again. We could even
>> > push each branch through the tree it belongs to, but I doubt we'll be able to
>> > push everything during a single merge window.
>>
>> Ah, ok -- you're suggesting bringing it _all_ in through arm-soc. We
>> can do so, I was of the initial impression from Simon's cover letter
>> that the arch/sh branches would also go through the SH tree.
>>
>> This seems to be a particularly hairy conversion, given that it touches two
>> architectures that need to be updated in lockstep. I guess we might be just as
>> well off pulling it in as-is (with below exceptions) to get it in.
>>
>> If you need the same contents in the SH tree due to dependencies and
>> later development, let me know and we can agree on a stable branch that
>> we both pick up in either tree that has all contents.
>>
> There isn't anything at the moment pending for the SH tree that cares
> about or conflicts with any of this work, so it's ok with me if this all
> goes through arm-soc. If there is any fallout we can take care of it
> later on in the merge window. This would seem to be a saner option than
> attempting to merge half a dozen branches with dependencies on each other
> in precise order, which doesn't leave a lot of time for fixing up
> any residual merge window damage.
Yup, that sounds good. Let's do it that way.
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas ARM-based SoC v3.9
Date: Wed, 23 Jan 2013 19:35:23 -0800 [thread overview]
Message-ID: <CAOesGMgegSh4rmdV3d7zMyN=JJXr9i6hQCNCeH49Z=FwWzotNw@mail.gmail.com> (raw)
In-Reply-To: <20130122091924.GB11708@linux-sh.org>
On Tue, Jan 22, 2013 at 1:19 AM, Paul Mundt <lethal@linux-sh.org> wrote:
> On Tue, Jan 22, 2013 at 12:21:23AM -0800, Olof Johansson wrote:
>> On Mon, Jan 21, 2013 at 04:31:43PM +0100, Laurent Pinchart wrote:
>> > Sure, we could push 1-6 through the ARM tree, wait until it reaches mainline,
>> > then push 7 through the pinctrl tree, wait until it reaches mainline, push 8
>> > through the SH tree and 9 through the ARM tree, wait until they reach
>> > mainline, and finally push 10 through the pinctrl tree again. We could even
>> > push each branch through the tree it belongs to, but I doubt we'll be able to
>> > push everything during a single merge window.
>>
>> Ah, ok -- you're suggesting bringing it _all_ in through arm-soc. We
>> can do so, I was of the initial impression from Simon's cover letter
>> that the arch/sh branches would also go through the SH tree.
>>
>> This seems to be a particularly hairy conversion, given that it touches two
>> architectures that need to be updated in lockstep. I guess we might be just as
>> well off pulling it in as-is (with below exceptions) to get it in.
>>
>> If you need the same contents in the SH tree due to dependencies and
>> later development, let me know and we can agree on a stable branch that
>> we both pick up in either tree that has all contents.
>>
> There isn't anything at the moment pending for the SH tree that cares
> about or conflicts with any of this work, so it's ok with me if this all
> goes through arm-soc. If there is any fallout we can take care of it
> later on in the merge window. This would seem to be a saner option than
> attempting to merge half a dozen branches with dependencies on each other
> in precise order, which doesn't leave a lot of time for fixing up
> any residual merge window damage.
Yup, that sounds good. Let's do it that way.
-Olof
next prev parent reply other threads:[~2013-01-24 3:35 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 4:38 [GIT PULL] Renesas ARM-based SoC defconfig for v3.8 Simon Horman
2012-10-17 4:38 ` Simon Horman
2012-10-17 4:38 ` [PATCH 1/2] ARM: shmobile: mackerel: defconfig update Simon Horman
2012-10-17 4:38 ` Simon Horman
2012-10-17 4:38 ` [PATCH 2/2] ARM: shmobile: armadillo800eva: enable L2X0 cache on defconfig Simon Horman
2012-10-17 4:38 ` Simon Horman
2012-10-17 13:42 ` [GIT PULL] Renesas ARM-based SoC defconfig for v3.8 Arnd Bergmann
2012-10-17 13:42 ` Arnd Bergmann
2012-10-18 0:58 ` Simon Horman
2012-10-18 0:58 ` Simon Horman
2012-10-18 7:29 ` Arnd Bergmann
2012-10-18 7:29 ` Arnd Bergmann
2012-10-18 8:13 ` Simon Horman
2012-10-18 8:13 ` Simon Horman
2012-10-19 3:09 ` Simon Horman
2012-10-19 3:09 ` Simon Horman
2012-10-19 8:18 ` Arnd Bergmann
2012-10-19 8:18 ` Arnd Bergmann
2012-10-22 0:33 ` Simon Horman
2012-10-22 0:33 ` Simon Horman
2012-10-22 1:51 ` Simon Horman
2012-10-22 1:51 ` Simon Horman
2012-10-22 14:12 ` Arnd Bergmann
2012-10-22 14:12 ` Arnd Bergmann
2012-10-22 18:20 ` Nicolas Pitre
2012-10-22 18:20 ` Nicolas Pitre
2012-10-30 7:45 ` Simon Horman
2012-10-30 7:45 ` Simon Horman
2012-10-30 21:41 ` Arnd Bergmann
2012-10-30 21:41 ` Arnd Bergmann
2012-11-01 0:46 ` Simon Horman
2012-11-01 0:46 ` Simon Horman
2013-01-10 1:23 ` [GIT PULL] Renesas ARM-based SoC defconfig for v3.9 Simon Horman
2013-01-10 1:23 ` Simon Horman
2013-01-10 1:23 ` [PATCH 1/5] ARM: mach-shmobile: mackerel: update defconfig Simon Horman
2013-01-10 1:23 ` Simon Horman
2013-01-10 23:11 ` Olof Johansson
2013-01-10 23:11 ` Olof Johansson
2013-01-11 0:36 ` Simon Horman
2013-01-11 0:36 ` Simon Horman
2013-01-10 1:23 ` [PATCH 2/5] ARM: shmobile: fix memory size for kota2_defconfig Simon Horman
2013-01-10 1:23 ` Simon Horman
2013-01-10 1:23 ` [PATCH 3/5] ARM: mach-shmobile: kzm9g: use voltage regulators by default Simon Horman
2013-01-10 1:23 ` Simon Horman
2013-01-10 1:23 ` [PATCH 4/5] ARM: mach-shmobile: armadillo: update defconfig Simon Horman
2013-01-10 1:23 ` Simon Horman
2013-01-10 1:23 ` [PATCH 5/5] ARM: mach-shmobile: kzm9g: Enable ARM_APPENDED_DTB in defconfig Simon Horman
2013-01-10 1:23 ` Simon Horman
2013-01-16 6:37 ` [GIT PULL] Renesas ARM-based SoC v3.9 Simon Horman
2013-01-16 23:43 ` Olof Johansson
2013-01-16 23:43 ` Olof Johansson
2013-01-21 15:31 ` Laurent Pinchart
2013-01-21 15:31 ` Laurent Pinchart
2013-01-22 8:21 ` Olof Johansson
2013-01-22 8:21 ` Olof Johansson
2013-01-22 9:19 ` Paul Mundt
2013-01-22 9:19 ` Paul Mundt
2013-01-24 3:35 ` Olof Johansson [this message]
2013-01-24 3:35 ` Olof Johansson
2013-01-21 0:32 ` Simon Horman
2013-01-21 0:32 ` Simon Horman
2013-01-21 2:17 ` Olof Johansson
2013-01-21 2:17 ` Olof Johansson
2013-01-25 2:02 ` [GIT PULL] Renesas ARM-based SoC defconfig for v3.9 #2 Simon Horman
2013-01-25 2:02 ` Simon Horman
2013-01-25 2:02 ` [PATCH 1/2] ARM: mach-shmobile: armadillo: defconfig: Enable CEU Simon Horman
2013-01-25 2:02 ` Simon Horman
2013-01-25 2:02 ` [PATCH 2/2] ARM: mach-shmobile: mackerel: enable VFP in defconfig Simon Horman
2013-01-25 2:02 ` Simon Horman
2013-01-29 17:01 ` [GIT PULL] Renesas ARM-based SoC defconfig for v3.9 #2 Olof Johansson
2013-01-29 17:01 ` Olof Johansson
2013-03-18 11:53 ` [GIT PULL] Renesas ARM-based SoC defconfig updates for v3.10 Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 1/9] ARM: mach-shmobile: mackerel: enable MMCIF and SDHI in defconfig Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 2/9] ARM: mach-shmobile: mackerel: enable REGULATOR " Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 3/9] ARM: mach-shmobile: armadillo800eva: " Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 4/9] ARM: shmobile: kzm9g: defconfig: do not enable PREEMPT Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 5/9] ARM: shmobile: armadillo800eva: enable branch prediction on defconfig Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 6/9] ARM: shmobile: armadillo800eva: enable NEON " Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 7/9] ARM: mach-shmobile: kzm9g: do not enable REGULATOR_DUMMY in defconfig Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 8/9] ARM: shmobile: armadillo800eva: enable all errata for cache on defconfig Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-18 11:53 ` [PATCH 9/9] ARM: mach-shmobile: marzen: add SATA support Simon Horman
2013-03-18 11:53 ` Simon Horman
2013-03-21 16:56 ` [GIT PULL] Renesas ARM-based SoC defconfig updates for v3.10 Arnd Bergmann
2013-03-21 16:56 ` Arnd Bergmann
2013-03-22 0:46 ` Simon Horman
2013-03-22 0:46 ` Simon Horman
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='CAOesGMgegSh4rmdV3d7zMyN=JJXr9i6hQCNCeH49Z=FwWzotNw@mail.gmail.com' \
--to=olof@lixom.net \
--cc=linux-arm-kernel@lists.infradead.org \
/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.