From: Paul Walmsley <paul@pwsan.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arm@kernel.org,
"Mark A. Greer" <mgreer@animalcreek.com>
Subject: Re: [GIT PULL 00/15] arm-soc: changes for v3.6
Date: Tue, 24 Jul 2012 14:51:35 -0600 (MDT) [thread overview]
Message-ID: <alpine.DEB.2.00.1207241436570.10781@utopia.booyaka.com> (raw)
In-Reply-To: <201207240751.39111.arnd@arndb.de>
Hi
On Tue, 24 Jul 2012, Arnd Bergmann wrote:
> On Tuesday 24 July 2012, Linus Torvalds wrote:
>
> > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > clockdomains_common[] array. In my merge, it is gone. But I think I
> > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > the code, maybe there is some subtle reason why you did it like you
> > did.
>
> Yes, I think you are right now that I look at it again. Paul Walmsley
> can have another look at the merge and send an update if we are both
> missing something now.
Linus' merge is correct.
thanks for asking,
- Paul
WARNING: multiple messages have this Message-ID (diff)
From: paul@pwsan.com (Paul Walmsley)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 00/15] arm-soc: changes for v3.6
Date: Tue, 24 Jul 2012 14:51:35 -0600 (MDT) [thread overview]
Message-ID: <alpine.DEB.2.00.1207241436570.10781@utopia.booyaka.com> (raw)
In-Reply-To: <201207240751.39111.arnd@arndb.de>
Hi
On Tue, 24 Jul 2012, Arnd Bergmann wrote:
> On Tuesday 24 July 2012, Linus Torvalds wrote:
>
> > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > clockdomains_common[] array. In my merge, it is gone. But I think I
> > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > the code, maybe there is some subtle reason why you did it like you
> > did.
>
> Yes, I think you are right now that I look at it again. Paul Walmsley
> can have another look at the merge and send an update if we are both
> missing something now.
Linus' merge is correct.
thanks for asking,
- Paul
next prev parent reply other threads:[~2012-07-24 20:51 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-23 20:32 [GIT PULL 00/15] arm-soc: changes for v3.6 Arnd Bergmann
2012-07-23 20:32 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 01/15] arm-soc: non-critical bug fixes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 02/15] arm-soc: general cleanups Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 03/15] arm-soc: soc-specific updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 04/15] arm-soc: samsung dma changes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 05/15] arm-soc: device tree description updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 06/15] arm-soc: spi updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 07/15] arm-soc: timer updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 08/15] arm-soc: cleanups, part 2 Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 09/15] arm-soc: new SoC support Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 10/15] arm-soc: defconfig updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 11/15] arm-soc: board specific updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 12/15] arm-soc: sparse IRQ conversion Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 13/15] arm-soc: pincontrol drivers Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 14/15] arm-soc: power management changes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 15/15] arm-soc: clk changes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-24 1:03 ` [GIT PULL 00/15] arm-soc: changes for v3.6 Linus Torvalds
2012-07-24 1:03 ` Linus Torvalds
2012-07-24 7:51 ` Arnd Bergmann
2012-07-24 7:51 ` Arnd Bergmann
2012-07-24 8:12 ` Tony Lindgren
2012-07-24 8:12 ` Tony Lindgren
2012-07-24 12:00 ` Arnd Bergmann
2012-07-24 12:00 ` Arnd Bergmann
2012-07-24 20:51 ` Paul Walmsley [this message]
2012-07-24 20:51 ` Paul Walmsley
2012-07-26 23:10 ` Mark A. Greer
2012-07-26 23:10 ` Mark A. Greer
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=alpine.DEB.2.00.1207241436570.10781@utopia.booyaka.com \
--to=paul@pwsan.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mgreer@animalcreek.com \
--cc=torvalds@linux-foundation.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.