From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Mark Brown <broonie@kernel.org>
Cc: Greg KH <greg@kroah.com>, Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the tree
Date: Thu, 13 Mar 2014 10:17:56 +0100 [thread overview]
Message-ID: <3306881.foYD0IDJn0@avalon> (raw)
In-Reply-To: <20140313005026.95bb2222270ded24b0a5deff@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 895 bytes --]
Hi Mark,
On Thursday 13 March 2014 00:50:26 Mark Brown wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
> ("[media] v4l: of: Support empty port nodes") from the v4l tree and
> commit fd9fdb78a9bf ("[media] of: move graph helpers from
> drivers/media/v4l2-core to drivers/of") from the staging tree.
>
> I fixed it up by essentially dropping the support for empty port nodes
> since there were more context differences than I was comfortable with
> in the changes in the new code.
If I'm not mistaken the move of drivers/media/v4l2-core/v4l2-of.c to
drivers/of/of-graph.c has been canceled for v3.15 and related patches should
be dropped from the for-next branches in the very near future (the v4l tree
has already been rebased).
--
Regards,
Laurent Pinchart
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2014-03-13 9:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 0:50 linux-next: manual merge of the staging tree with the tree Mark Brown
2014-03-13 9:17 ` Laurent Pinchart [this message]
2014-03-20 15:44 ` Grant Likely
2014-03-20 17:09 ` Mauro Carvalho Chehab
2014-03-20 18:51 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2015-12-02 20:17 Mark Brown
2015-12-02 22:07 ` Greg KH
2015-12-03 0:07 ` Mark Brown
2014-08-01 6:21 Stephen Rothwell
2014-08-01 7:38 ` Greg KH
2014-07-11 5:21 Stephen Rothwell
2014-07-11 5:32 ` Sachin Kamat
2014-07-11 6:10 ` Stephen Rothwell
2014-07-11 6:22 ` Sachin Kamat
2014-07-12 16:53 ` Greg KH
2014-03-12 1:37 Mark Brown
2014-03-12 1:32 Mark Brown
2014-03-12 1:49 ` Greg KH
2014-03-12 1:27 Mark Brown
2014-03-12 1:48 ` Greg KH
2010-11-10 2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH
2009-03-19 10:12 Stephen Rothwell
2009-03-19 15:32 ` Greg KH
2009-03-19 15:53 ` Greg KH
2009-03-19 21:42 ` 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=3306881.foYD0IDJn0@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=p.zabel@pengutronix.de \
/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.