From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>, Joe Woodward <jw@terrafix.co.uk>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: OMAP3: clockdomain: fix accidental duplicate registration
Date: Tue, 24 Jul 2012 01:16:38 -0700 [thread overview]
Message-ID: <20120724081636.GT6522@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1207191242080.14390@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [120719 12:17]:
> On Thu, 19 Jul 2012, Tony Lindgren wrote:
>
> > Well I'm still a bit confused :)
> >
> > Which branch in arm-soc tree should this fix be applied then?
>
> In terms of arm-soc, it's needed in arm-soc for-next, due to commit
> 066b6eba6d58ad1cb9ec3917b6ee79730c3c3310 ("Merge branch 'next/cleanup'
> into for-next"). That merge commit resolves the conflict the same way
> that the linux-omap tree commit 3dd50d0545bd5a8ad83d4339f07935cd3e883271
> ("Merge tag 'omap-cleanup-for-v3.6' into tmp-merge") did.
>
> 066b6eba is also present in a few other arm-soc branches:
>
> arm-soc/staging/io-cleanup-pci
> arm-soc/tmp
>
> I did not do an exhaustive search for similar mismerges under different
> commit IDs.
OK looks like Linus fixed up part of it, care to check what's needed
against current mainline now?
Tony
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP3: clockdomain: fix accidental duplicate registration
Date: Tue, 24 Jul 2012 01:16:38 -0700 [thread overview]
Message-ID: <20120724081636.GT6522@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1207191242080.14390@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [120719 12:17]:
> On Thu, 19 Jul 2012, Tony Lindgren wrote:
>
> > Well I'm still a bit confused :)
> >
> > Which branch in arm-soc tree should this fix be applied then?
>
> In terms of arm-soc, it's needed in arm-soc for-next, due to commit
> 066b6eba6d58ad1cb9ec3917b6ee79730c3c3310 ("Merge branch 'next/cleanup'
> into for-next"). That merge commit resolves the conflict the same way
> that the linux-omap tree commit 3dd50d0545bd5a8ad83d4339f07935cd3e883271
> ("Merge tag 'omap-cleanup-for-v3.6' into tmp-merge") did.
>
> 066b6eba is also present in a few other arm-soc branches:
>
> arm-soc/staging/io-cleanup-pci
> arm-soc/tmp
>
> I did not do an exhaustive search for similar mismerges under different
> commit IDs.
OK looks like Linus fixed up part of it, care to check what's needed
against current mainline now?
Tony
next prev parent reply other threads:[~2012-07-24 8:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 10:54 [PATCH] ARM: OMAP3: clockdomain: fix accidental duplicate registration Paul Walmsley
2012-07-12 10:54 ` Paul Walmsley
2012-07-12 17:50 ` Kevin Hilman
2012-07-12 17:50 ` Kevin Hilman
2012-07-13 6:47 ` Tony Lindgren
2012-07-13 6:47 ` Tony Lindgren
2012-07-14 8:52 ` Tony Lindgren
2012-07-14 8:52 ` Tony Lindgren
2012-07-14 17:54 ` Paul Walmsley
2012-07-14 17:54 ` Paul Walmsley
2012-07-16 8:36 ` Tony Lindgren
2012-07-16 8:36 ` Tony Lindgren
2012-07-18 9:53 ` Paul Walmsley
2012-07-18 9:53 ` Paul Walmsley
2012-07-19 11:52 ` Tony Lindgren
2012-07-19 11:52 ` Tony Lindgren
2012-07-19 19:12 ` Paul Walmsley
2012-07-19 19:12 ` Paul Walmsley
2012-07-24 8:16 ` Tony Lindgren [this message]
2012-07-24 8:16 ` Tony Lindgren
2012-07-24 20:52 ` Paul Walmsley
2012-07-24 20:52 ` Paul Walmsley
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=20120724081636.GT6522@atomide.com \
--to=tony@atomide.com \
--cc=jw@terrafix.co.uk \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
/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.