From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] staging: imx-drm-core: skip components whose parent device is disabled
Date: Tue, 22 Apr 2014 07:31:49 +0800 [thread overview]
Message-ID: <20140421233148.GZ2523@dragon> (raw)
In-Reply-To: <CAOesGMiDqd+JSd_fzzeWohSGixuR1ciOz_FO5CGnSm7F3ioxDw@mail.gmail.com>
On Mon, Apr 21, 2014 at 07:22:52AM -0700, Olof Johansson wrote:
> On Sat, Apr 19, 2014 at 4:00 AM, Shawn Guo <shawn.guo@freescale.com> wrote:
> > On Sat, Apr 19, 2014 at 09:42:29AM +0100, Russell King - ARM Linux wrote:
> >> On Sat, Apr 19, 2014 at 01:53:08PM +0800, Shawn Guo wrote:
> >> > BTW, can you take a look at the following two patches, or are they
> >> > already in your queue?
> >> >
> >> > imx-drm: imx-drm-core: Fix imx_drm_encoder_get_mux_id
> >> > https://lkml.org/lkml/2014/4/7/58
> >>
> >> This one now is.
> >>
> >> > mx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'
> >> > ('i' is missing from the prefix word, and it should be 'imx-drm')
> >> > http://www.spinics.net/lists/arm-kernel/msg321057.html
> >>
> >> This one touches arch/arm/boot/dts, which Arnd moaned at me for touching
> >> via the staging tree during the merge window. So, while I can take the
> >> imx-tve part, I can't take the arch/arm/boot/dts part. This patch needs
> >> to be split.
> >>
> >> It also means that the MBA platform will have its TVE output broken while
> >> the two commits take their different paths, but I guess that's what you
> >> get for this kind of sillyness about git trees having exclusive ownership
> >> of various files in the kernel tree - more breakage not less.
> >
> > I think Arnd's main concern is about merge conflict, which shouldn't be
> > a problem for this particular case. The change on dts file is pretty
> > trivial. And I assume this is a fix to be landed on mainline before
> > -rc5 or so. Then I can rebase my DT branch on top of it. That said,
> > merge conflict is not really a problem for this patch. Arnd?
>
> I'm not Arnd, but that should work well.
Thanks, Olof.
Shawn
next prev parent reply other threads:[~2014-04-21 23:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 2:02 [PATCH v2] staging: imx-drm-core: skip components whose parent device is disabled Shawn Guo
2014-04-14 8:01 ` Philipp Zabel
2014-04-18 20:42 ` Russell King - ARM Linux
2014-04-19 5:53 ` Shawn Guo
2014-04-19 8:42 ` Russell King - ARM Linux
2014-04-19 11:00 ` Shawn Guo
2014-04-21 14:22 ` Olof Johansson
2014-04-21 23:31 ` Shawn Guo [this message]
2014-04-22 20:49 ` Arnd Bergmann
2014-04-22 21:55 ` Russell King - ARM Linux
2014-04-23 7:44 ` Shawn Guo
2014-04-23 9:00 ` Russell King - ARM Linux
2014-04-24 21:36 ` Arnd Bergmann
2014-04-26 10:20 ` Russell King - ARM Linux
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=20140421233148.GZ2523@dragon \
--to=shawn.guo@freescale.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 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.