linux-kernel - linux-next: manual merge of the staging tree with the v4l-dvb 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>] [day] [month] [year] [list]

Date:   Mon, 8 Oct 2018 15:53:15 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>,
        Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Steve Longerbeam <slongerbeam@...il.com>,
        Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/media/imx/imx-media-of.c

between commit:

  21711787045d ("media: staging/imx: of: Remove recursive graph walk")

from the v4l-dvb tree and commit:

  f93861c2d611 ("staging: Convert to using %pOFn instead of device_node.name")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/media/imx/imx-media-of.c
index 1c9175433ba6,163437e421c5..000000000000
--- a/drivers/staging/media/imx/imx-media-of.c
+++ b/drivers/staging/media/imx/imx-media-of.c
@@@ -20,13 -20,67 +20,13 @@@
  #include <video/imx-ipu-v3.h>
  #include "imx-media.h"
  
 -static int of_get_port_count(const struct device_node *np)
 +static int of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np)
  {
 -	struct device_node *ports, *child;
 -	int num = 0;
 +	int ret;
  
 -	/* check if this node has a ports subnode */
 -	ports = of_get_child_by_name(np, "ports");
 -	if (ports)
 -		np = ports;
 -
 -	for_each_child_of_node(np, child)
 -		if (of_node_cmp(child->name, "port") == 0)
 -			num++;
 -
 -	of_node_put(ports);
 -	return num;
 -}
 -
 -/*
 - * find the remote device node given local endpoint node
 - */
 -static bool of_get_remote(struct device_node *epnode,
 -			  struct device_node **remote_node)
 -{
 -	struct device_node *rp, *rpp;
 -	struct device_node *remote;
 -	bool is_csi_port;
 -
 -	rp = of_graph_get_remote_port(epnode);
 -	rpp = of_graph_get_remote_port_parent(epnode);
 -
 -	if (of_device_is_compatible(rpp, "fsl,imx6q-ipu")) {
 -		/* the remote is one of the CSI ports */
 -		remote = rp;
 -		of_node_put(rpp);
 -		is_csi_port = true;
 -	} else {
 -		remote = rpp;
 -		of_node_put(rp);
 -		is_csi_port = false;
 -	}
 -
 -	if (!of_device_is_available(remote)) {
 -		of_node_put(remote);
 -		*remote_node = NULL;
 -	} else {
 -		*remote_node = remote;
 -	}
 -
 -	return is_csi_port;
 -}
 -
 -static int
 -of_parse_subdev(struct imx_media_dev *imxmd, struct device_node *sd_np,
 -		bool is_csi_port)
 -{
 -	int i, num_ports, ret;
 -
 -	if (!of_device_is_available(sd_np)) {
 +	if (!of_device_is_available(csi_np)) {
- 		dev_dbg(imxmd->md.dev, "%s: %s not enabled\n", __func__,
- 			csi_np->name);
+ 		dev_dbg(imxmd->md.dev, "%s: %pOFn not enabled\n", __func__,
 -			sd_np);
++			csi_np);
  		/* unavailable is not an error */
  		return 0;
  	}

Content of type "application/pgp-signature" skipped