From: Tony Lindgren <tony@atomide.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Rob Clark <rob@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the staging tree
Date: Wed, 31 Oct 2012 09:23:15 -0700 [thread overview]
Message-ID: <20121031162314.GD12739@atomide.com> (raw)
In-Reply-To: <20121031161614.GF31804@kroah.com>
* Greg KH <greg@kroah.com> [121031 09:17]:
> On Wed, Oct 31, 2012 at 04:19:21PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mach-omap2/drm.c between commit 5e3b08749951 ("staging:
> > drm/omap: add support for ARCH_MULTIPLATFORM") from the staging tree and
> > commit 2a296c8f89bc ("ARM: OMAP: Make plat/omap_hwmod.h local to
> > mach-omap2") from the arm-soc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Looks good to me, thanks for this.
Yes thanks.
Tony
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the staging tree
Date: Wed, 31 Oct 2012 09:23:15 -0700 [thread overview]
Message-ID: <20121031162314.GD12739@atomide.com> (raw)
In-Reply-To: <20121031161614.GF31804@kroah.com>
* Greg KH <greg@kroah.com> [121031 09:17]:
> On Wed, Oct 31, 2012 at 04:19:21PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mach-omap2/drm.c between commit 5e3b08749951 ("staging:
> > drm/omap: add support for ARCH_MULTIPLATFORM") from the staging tree and
> > commit 2a296c8f89bc ("ARM: OMAP: Make plat/omap_hwmod.h local to
> > mach-omap2") from the arm-soc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Looks good to me, thanks for this.
Yes thanks.
Tony
next prev parent reply other threads:[~2012-10-31 16:23 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 5:19 linux-next: manual merge of the arm-soc tree with the staging tree Stephen Rothwell
2012-10-31 5:19 ` Stephen Rothwell
2012-10-31 5:19 ` Stephen Rothwell
2012-10-31 16:16 ` Greg KH
2012-10-31 16:16 ` Greg KH
2012-10-31 16:23 ` Tony Lindgren [this message]
2012-10-31 16:23 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-09-17 9:20 Stephen Rothwell
2012-09-17 9:20 ` Stephen Rothwell
2012-09-17 9:20 ` Stephen Rothwell
2012-09-17 20:53 ` Tony Lindgren
2012-09-17 20:53 ` Tony Lindgren
2012-05-16 8:58 Stephen Rothwell
2012-05-16 8:58 ` Stephen Rothwell
2012-05-16 8:58 ` Stephen Rothwell
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 12:48 ` Greg KH
2012-05-16 12:48 ` Greg KH
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:10 ` Greg KH
2012-05-16 13:10 ` Greg KH
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 14:33 ` Arnd Bergmann
2012-05-16 14:33 ` 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=20121031162314.GD12739@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rob@ti.com \
--cc=sfr@canb.auug.org.au \
/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.