From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 4/5] ARM: arm-soc: late cleanups
Date: Tue, 7 May 2013 20:17:59 -0700 [thread overview]
Message-ID: <20130508031758.GT28721@atomide.com> (raw)
In-Reply-To: <CA+55aFxHZSYV3UZMf+ezADX5z2psLm5a9Wpp6qcDQho7n2J6SA@mail.gmail.com>
* Linus Torvalds <torvalds@linux-foundation.org> [130507 18:05]:
> On Tue, May 7, 2013 at 4:19 PM, Tony Lindgren <tony@atomide.com> wrote:
> >
> >> Vaibhav Hiremath (1):
> >> ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
> >
> > Turns out this urgent boot fix got undone in the merge somehow.
>
> Those lines actually disappeared already much earlier in my merge 6fa52ed33bea:
>
> Merge tag 'drivers-for-linus' of
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
>
> last Saturday.
Yes then we patched it on Sunday, and Arnd merged it into his branch.
But then hose lines disappeared again for the third time :)
> And it's my bad. I even know how it happened: I ended up doing that
> merge twice (because I had to go back and fix something else), and
> then I "optimized" it the second time. With all the omap2 conflicts
> from that tree came from duplicate commits from the ARM tree, and I
> ended up just taking the drivers-for-linus side for
> arch/arm/mach-omap2. Which was correct for the other two files in
> there (gpmc.c and gpmc-onenand.c). but the timer.c file had changes
> from the arm tree.
>
> Sorry about that one.
No problem, thanks for fixing it quickly.
Regards,
Tony
next prev parent reply other threads:[~2013-05-08 3:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 1/5] ARM: arm-soc platform updates for 3.10, part 2 Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 2/5] ARM: arm-soc platform updates for 3.10, part 3 Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 3/5] ARM: arm-soc device tree changes, part 2 Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 4/5] ARM: arm-soc: late cleanups Arnd Bergmann
2013-05-07 23:19 ` Tony Lindgren
2013-05-08 0:59 ` Linus Torvalds
2013-05-08 3:17 ` Tony Lindgren [this message]
2013-05-08 3:48 ` Linus Torvalds
2013-05-08 4:27 ` Olof Johansson
2013-05-07 17:26 ` [GIT PULL 5/5] ARM: arm-soc: late Exynos multiplatform changes Arnd Bergmann
2013-05-07 18:01 ` [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Linus Torvalds
2013-05-07 18:41 ` 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=20130508031758.GT28721@atomide.com \
--to=tony@atomide.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox