From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Sascha Hauer <s.hauer@pengutronix.de>,
Javier Martin <javier.martin@vista-silicon.com>,
Rob Herring <rob.herring@calxeda.com>,
linux-media@vger.kernel.org
Subject: Re: [PATCH v2 27/34] media: mx2_camera: remove cpu_is_xxx by using platform_device_id
Date: Sat, 6 Oct 2012 11:39:05 -0300 [thread overview]
Message-ID: <20121006113905.3facece0@redhat.com> (raw)
In-Reply-To: <20121006082638.GB20231@S2101-09.ap.freescale.net>
Em Sat, 6 Oct 2012 16:26:40 +0800
Shawn Guo <shawn.guo@linaro.org> escreveu:
> On Thu, Sep 27, 2012 at 04:03:21PM -0300, Mauro Carvalho Chehab wrote:
> > It seems that it depends on some stuff that got merged via the arm tree.
> >
> > Not sure what would the better way to handle that, as applying it via -arm
> > will likely generate conflicts when merging from both trees upstream.
> >
> > If this change is not urgent, maybe it would be better to apply it after
> > the end of the merge window, via either one of the trees.
> >
> That's the original plan, having it merged via arm-soc tree at the end
> of 3.7 merge window. But I was told by arm-soc folks that we already
> have enough conflicts to sort out for this window, and we do not want
> any more. And we have to postpone it to 3.8.
>
> I will publish a topic branch for this series after 3.7-rc1 comes out.
Ok. Btw, as expected, the patch doesn't apply cleanly anymore, due to the
file renames. Waiting for 3.7-rc1 seems to be the right thing to do here.
--
Regards,
Mauro
next prev parent reply other threads:[~2012-10-06 14:39 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 6:45 [PATCH v2 00/34] i.MX multi-platform support Shawn Guo
2012-09-20 6:45 ` [PATCH v2 11/34] media: mx1_camera: remove the driver Shawn Guo
2012-09-20 12:56 ` Mauro Carvalho Chehab
2012-09-20 14:47 ` Shawn Guo
2012-09-20 6:45 ` [PATCH v2 13/34] dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h Shawn Guo
2012-09-20 6:45 ` [PATCH v2 25/34] media: mx2_camera: remove dead code in mx2_camera_add_device Shawn Guo
2012-09-20 6:45 ` [PATCH v2 26/34] media: mx2_camera: use managed functions to clean up code Shawn Guo
2012-09-20 6:45 ` [PATCH v2 27/34] media: mx2_camera: remove cpu_is_xxx by using platform_device_id Shawn Guo
[not found] ` <20120927160321.56420910@redhat.com>
2012-10-06 8:26 ` Shawn Guo
2012-10-06 14:39 ` Mauro Carvalho Chehab [this message]
2012-09-20 7:39 ` [PATCH v2 00/34] i.MX multi-platform support Arnd Bergmann
2012-09-20 11:41 ` Mark Brown
2012-09-20 11:52 ` Shawn Guo
2012-09-20 12:47 ` Mark Brown
2012-09-20 13:36 ` Shawn Guo
2012-09-20 14:53 ` Shawn Guo
2012-09-20 15:56 ` Arnd Bergmann
2012-09-21 8:01 ` [alsa-devel] " Shawn Guo
2012-09-21 8:26 ` Olof Johansson
2012-09-21 16:46 ` Shawn Guo
2012-09-21 16:53 ` Shawn Guo
2012-09-22 7:41 ` Olof Johansson
2012-09-22 8:09 ` Olof Johansson
2012-09-22 9:34 ` Shawn Guo
2012-09-22 15:43 ` Mark Brown
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=20121006113905.3facece0@redhat.com \
--to=mchehab@redhat.com \
--cc=arnd@arndb.de \
--cc=javier.martin@vista-silicon.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=rob.herring@calxeda.com \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.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;
as well as URLs for NNTP newsgroup(s).