Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 12 Jul 2019 10:53:40 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Mathieu Poirier <mathieu.poirier@linaro.org>,
        Nathan Chancellor <natechancellor@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree
Message-ID: <20190712105340.1520bce0@canb.auug.org.au>
In-Reply-To: <20190701190940.7f23ac15@canb.auug.org.au>
References: <20190701190940.7f23ac15@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/lsCaH7KgcM/R.cV75LDzF0."; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/lsCaH7KgcM/R.cV75LDzF0.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>=20
>   drivers/hwtracing/coresight/of_coresight.c
>=20
> between commit:
>=20
>   418e3ea157ef ("bus_find_device: Unify the match callback with class_fin=
d_device")
>=20
> from the driver-core tree and commits:
>=20
>   22aa495a6477 ("coresight: Rename of_coresight to coresight-platform")
>   20961aea982e ("coresight: platform: Use fwnode handle for device search=
")
>=20
> from the char-misc tree.
>=20
> I fixed it up (I removed the file and added the following merge fix patch)
> 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.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 1 Jul 2019 19:07:20 +1000
> Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match cal=
lback
>  with class_find_device"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/hwtracing/coresight/coresight-platform.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/h=
wtracing/coresight/coresight-platform.c
> index 3c5ceda8db24..fc67f6ae0b3e 100644
> --- a/drivers/hwtracing/coresight/coresight-platform.c
> +++ b/drivers/hwtracing/coresight/coresight-platform.c
> @@ -37,7 +37,7 @@ static int coresight_alloc_conns(struct device *dev,
>  	return 0;
>  }
> =20
> -int coresight_device_fwnode_match(struct device *dev, void *fwnode)
> +int coresight_device_fwnode_match(struct device *dev, const void *fwnode)
>  {
>  	return dev_fwnode(dev) =3D=3D fwnode;
>  }

This is now a conflict between the driver-core tree and Linus' tree.

The declaration of coresight_device_fwnode_match() also needs fixing up
in drivers/hwtracing/coresight/coresight-priv.h (as done in the patch
below supplied by Nathan Chancellor).

From: Nathan Chancellor <natechancellor@gmail.com>
Date: Mon, 1 Jul 2019 11:28:08 -0700
Subject: [PATCH] coresight: Make the coresight_device_fwnode_match declarat=
ion's fwnode parameter const

drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointe=
r types passing 'int (struct device *, void *)' to parameter of type 'int (=
*)(struct device *, const void *)' [-Werror,-Wincompatible-pointer-types]
                                      coresight_device_fwnode_match);
                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/device.h:173:17: note: passing argument to parameter 'match' =
here
                               int (*match)(struct device *dev, const void =
*data));
                                     ^
1 error generated.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 drivers/hwtracing/coresight/coresight-priv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtraci=
ng/coresight/coresight-priv.h
index 8b07fe55395a..7d401790dd7e 100644
--- a/drivers/hwtracing/coresight/coresight-priv.h
+++ b/drivers/hwtracing/coresight/coresight-priv.h
@@ -202,6 +202,6 @@ static inline void *coresight_get_uci_data(const struct=
 amba_id *id)
=20
 void coresight_release_platform_data(struct coresight_platform_data *pdata=
);
=20
-int coresight_device_fwnode_match(struct device *dev, void *fwnode);
+int coresight_device_fwnode_match(struct device *dev, const void *fwnode);
=20
 #endif
--=20
2.22.0

--=20
Cheers,
Stephen Rothwell

--Sig_/lsCaH7KgcM/R.cV75LDzF0.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0n2hQACgkQAVBC80lX
0GzZbAf+IIK26LPqifxVvuY00AX/q8lGWfwgoia+ByrQtdBWo3hM0xWDdoUwxLjp
T8IgdOy1Q2nBr8FYLVK6Y5cCgcbbI2AzK3W39g2jZ1MD9AtRZEVpXNlx/RMM4bwn
rFcNFVyVt4EjFGqJ1PfpXkBEyBwc3vwDOVeFF7xYRoXgkLh9xNH1Z1KS3iqZ3bZ6
EvrZ7lZdb5wJ8arfc2KAilcpUsbmoPqnFhudA5TyOOCX883ZqxL6lGYD5VCkxq1l
J8/b02JzlGxZI2y8SLHF74s9Y1sktVASgdlhNHop/QKopckK1n1LRZT9t7skAyPH
eb5lo2yeV+O36KY3JW/fZZIXNl6aXQ==
=NuX5
-----END PGP SIGNATURE-----

--Sig_/lsCaH7KgcM/R.cV75LDzF0.--