From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 00/15] arm-soc: changes for v3.6
Date: Tue, 24 Jul 2012 07:51:38 +0000 [thread overview]
Message-ID: <201207240751.39111.arnd@arndb.de> (raw)
In-Reply-To: <CA+55aFyObNFgsaVOsjVOcH+aLjDyOgcqpvckM29T3dvugekVwg@mail.gmail.com>
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.
> Your "for-linus" branch also had that
>
> arch/arm/arm-soc-for-next-contents.txt
>
> file that shouldn't have been there, but whatever.
That's the file I use for communication with Olof about stuff we
merge. I briefly considered rebuilding a branch for your reference
without it, but since you always do the merges yourself I figured there
would be no need.
We do leave this file in the for-next branch because it helps some
people sending us patches to see what the existing branches and
interdependencies are.
> Anyway, apart from that "please check" comment, I also have small
> complaint: your pull requests didn't actually point to the tags, they
> pointed to the next/xyz commits. So every time I did a pull, I had to
> change "next/xyz" to "tags/xyz". That's just annoying make-work. I
> think it's because you just said "xyz" to the git request-pull script,
> and then git had to pick one of the things and picked next. Please
> disambiguate by just saying "tags/xyz" explicitly.
I spent too much time fiddling with my scripts again in an attempt to
get closer to the regular git-request-pull version. The older version
got this right, but unfortunately I removed the part where I manually
print the right pull address because that had caused other problems
before.
I did the trivial fix you suggested now.
Arnd
next prev parent reply other threads:[~2012-07-24 7:51 UTC|newest]
Thread overview: 22+ 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:33 ` [GIT PULL 01/15] arm-soc: non-critical bug fixes Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 06/15] arm-soc: spi updates Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 15/15] arm-soc: clk changes Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 08/15] arm-soc: cleanups, part 2 Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 04/15] arm-soc: samsung dma changes Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 09/15] arm-soc: new SoC support Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 14/15] arm-soc: power management changes Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 07/15] arm-soc: timer updates Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 13/15] arm-soc: pincontrol drivers Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 10/15] arm-soc: defconfig updates Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 03/15] arm-soc: soc-specific updates Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 11/15] arm-soc: board specific updates Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 05/15] arm-soc: device tree description updates Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 12/15] arm-soc: sparse IRQ conversion Arnd Bergmann
2012-07-23 20:33 ` [GIT PULL 02/15] arm-soc: general cleanups Arnd Bergmann
2012-07-24 1:03 ` [GIT PULL 00/15] arm-soc: changes for v3.6 Linus Torvalds
2012-07-24 7:51 ` Arnd Bergmann [this message]
2012-07-24 8:12 ` Tony Lindgren
2012-07-24 12:00 ` Arnd Bergmann
2012-07-24 20:51 ` Paul Walmsley
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=201207240751.39111.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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