linux-kernel - Re: linux-next: manual merge of the staging tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <3306881.foYD0IDJn0@avalon>
Date:	Thu, 13 Mar 2014 10:17:56 +0100
From:	Laurent Pinchart <laurent.pinchart@...asonboard.com>
To:	Mark Brown <broonie@...nel.org>
Cc:	Greg KH <greg@...ah.com>, Philipp Zabel <p.zabel@...gutronix.de>,
	Mauro Carvalho Chehab <m.chehab@...sung.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the  tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (491 bytes)