From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the sound-asoc tree
Date: Thu, 20 Sep 2012 15:01:44 -0700 [thread overview]
Message-ID: <20120920220143.GI28835@atomide.com> (raw)
In-Reply-To: <20120920160637.7f9065225982468c25fa1952@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [120919 23:07]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c,
> sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit
> 152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the
> sound-asoc tree and commit 2203747c9771 ("ARM: omap: move platform_data
> definitions") from the arm-soc tree.
>
> The former removed the files, so I did that and can carry the fix as
> necessary (no action is required).
OK thanks again.
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 sound-asoc tree
Date: Thu, 20 Sep 2012 15:01:44 -0700 [thread overview]
Message-ID: <20120920220143.GI28835@atomide.com> (raw)
In-Reply-To: <20120920160637.7f9065225982468c25fa1952@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [120919 23:07]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c,
> sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit
> 152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the
> sound-asoc tree and commit 2203747c9771 ("ARM: omap: move platform_data
> definitions") from the arm-soc tree.
>
> The former removed the files, so I did that and can carry the fix as
> necessary (no action is required).
OK thanks again.
Tony
next prev parent reply other threads:[~2012-09-20 22:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 6:06 linux-next: manual merge of the arm-soc tree with the sound-asoc tree Stephen Rothwell
2012-09-20 6:06 ` Stephen Rothwell
2012-09-20 6:06 ` Stephen Rothwell
2012-09-20 22:01 ` Tony Lindgren [this message]
2012-09-20 22:01 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-12-10 6:40 Stephen Rothwell
2012-12-10 6:40 ` Stephen Rothwell
2012-12-10 6:40 ` Stephen Rothwell
2012-12-10 6:49 ` Olof Johansson
2012-12-10 6:49 ` Olof Johansson
2012-05-14 8:54 Stephen Rothwell
2012-05-14 8:54 ` Stephen Rothwell
2012-05-14 8:54 ` Stephen Rothwell
2012-03-14 6:06 Stephen Rothwell
2012-03-14 6:06 ` Stephen Rothwell
2012-03-14 6:06 ` Stephen Rothwell
2012-03-14 12:36 ` Mark Brown
2012-03-14 12:36 ` Mark Brown
2012-03-06 6:24 Stephen Rothwell
2012-03-06 6:24 ` Stephen Rothwell
2012-03-06 6:24 ` Stephen Rothwell
2012-03-06 6:21 Stephen Rothwell
2012-03-06 6:21 ` Stephen Rothwell
2012-03-06 6:21 ` Stephen Rothwell
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=20120920220143.GI28835@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@ti.com \
--cc=olof@lixom.net \
--cc=peter.ujfalusi@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.