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:   Mon, 1 Jul 2019 19:09:40 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc:     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>
Subject: linux-next: manual merge of the char-misc tree with the driver-core
 tree
Message-ID: <20190701190940.7f23ac15@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/w_KPwi04vtaR+bmu90XDEeM"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/w_KPwi04vtaR+bmu90XDEeM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/hwtracing/coresight/of_coresight.c

between commit:

  418e3ea157ef ("bus_find_device: Unify the match callback with class_find_=
device")

from the driver-core tree and commits:

  22aa495a6477 ("coresight: Rename of_coresight to coresight-platform")
  20961aea982e ("coresight: platform: Use fwnode handle for device search")

from the char-misc tree.

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.

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 callb=
ack
 with class_find_device"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hwtracing/coresight/coresight-platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwt=
racing/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;
 }
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/w_KPwi04vtaR+bmu90XDEeM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0ZzdQACgkQAVBC80lX
0Gwv2Qf9GjZkU2JzPMuJ1xhcyTzOoq6RNWz7LUUaS34qvI4Aou+eQb2xv+/6E5lb
loS5GGUjXBKrlGDEgfkxxuIjEY8y0YPG/kQyhPkYK4JFC/B2B8OjE0iVdxbgqu/Y
9A7vHz6lhAK5mVjFgw1oZnQUL6WywjGoCTtgLzVG/aThKCNVtGE3h/cYHtrFGQuT
uVr1iN2t621lsekTE9IV3y8QUzF58cMVEb2h7GJdS2pfKhQ4MCuYMIOcqWlsq8C7
m7JAGPl+SOXmnfGCwSTcmvbF7GGWyaUvLXpsMpD3IBh1GOTl1YBwDLkic2TKKafY
Y4mKeIXrE4D09M3RSk4dVa+059WVoA==
=/hD3
-----END PGP SIGNATURE-----

--Sig_/w_KPwi04vtaR+bmu90XDEeM--