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 <[email protected]>
Date: Mon, 1 Jul 2019 19:07:20 +1000
Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
with class_find_device"
Signed-off-by: Stephen Rothwell <[email protected]>
---
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/hwtracing/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;
}
-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) == fwnode;
}
--
2.20.1
--
Cheers,
Stephen Rothwell
On Mon, Jul 01, 2019 at 07:09:40PM +1000, Stephen Rothwell wrote:
> 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 <[email protected]>
> Date: Mon, 1 Jul 2019 19:07:20 +1000
> Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
> with class_find_device"
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> 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/hwtracing/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;
> }
>
> -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) == fwnode;
> }
> --
> 2.20.1
>
> --
> Cheers,
> Stephen Rothwell
Hi Stephen,
The attached patch is needed in addition to this to avoid a build error
about incompatible pointer types (in the commit message).
Cheers,
Nathan
On Mon, Jul 01, 2019 at 07:09:40PM +1000, Stephen Rothwell wrote:
> 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 <[email protected]>
> Date: Mon, 1 Jul 2019 19:07:20 +1000
> Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
> with class_find_device"
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> 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/hwtracing/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;
> }
>
> -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) == fwnode;
> }
> --
> 2.20.1
>
> --
> Cheers,
> Stephen Rothwell
Hi Stephen and Michael,
It looks like a similar fix is needed for the vhost tree because of
commit edcd69ab9a32 ("iommu: Add virtio-iommu driver") interacting with
commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with
class_find_device()") in the driver-core tree (my patch is attached).
Cheers,
Nathan
Hi Nathan,
On Mon, 1 Jul 2019 11:39:40 -0700 Nathan Chancellor <[email protected]> wrote:
>
> The attached patch is needed in addition to this to avoid a build error
> about incompatible pointer types (in the commit message).
Thanks, I will add it to my merge resolution today.
--
Cheers,
Stephen Rothwell
Hi Nathan,
On Mon, 1 Jul 2019 13:04:18 -0700 Nathan Chancellor <[email protected]> wrote:
>
> It looks like a similar fix is needed for the vhost tree because of
> commit edcd69ab9a32 ("iommu: Add virtio-iommu driver") interacting with
> commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with
> class_find_device()") in the driver-core tree (my patch is attached).
Thanks for noticing that, I will add that to the merge of the vhost
tree from today.
--
Cheers,
Stephen Rothwell
Hi,
[Adding Joerg]
On Mon, Jul 01, 2019 at 09:04:18PM +0100, Nathan Chancellor wrote:
> On Mon, Jul 01, 2019 at 07:09:40PM +1000, Stephen Rothwell wrote:
> > 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 <[email protected]>
> > Date: Mon, 1 Jul 2019 19:07:20 +1000
> > Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
> > with class_find_device"
> >
> > Signed-off-by: Stephen Rothwell <[email protected]>
> > ---
> > 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/hwtracing/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;
> > }
> >
> > -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) == fwnode;
> > }
> > --
> > 2.20.1
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
> Hi Stephen and Michael,
>
> It looks like a similar fix is needed for the vhost tree because of
> commit edcd69ab9a32 ("iommu: Add virtio-iommu driver") interacting with
> commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with
> class_find_device()") in the driver-core tree (my patch is attached).
Nathan, thanks for noticing and fixing this.
Joerg, the virtio-iommu driver build failed in next because of a
dependency on driver-core changes for v5.3. I'm not sure what the best
practice is in this case, I guess I will resend the driver as applied
onto the latest driver-core, to have it working in v5.3?
Thanks,
Jean
> From 347a1bbeb8ba757648ceeed1839df101417a3d9f Mon Sep 17 00:00:00 2001
> From: Nathan Chancellor <[email protected]>
> Date: Mon, 1 Jul 2019 12:54:28 -0700
> Subject: [PATCH] iommu/virtio: Constify data parameter in viommu_match_node
>
> After commit 92ce7e83b4e5 ("driver_find_device: Unify the match
> function with class_find_device()") in the driver-core tree.
>
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---
> drivers/iommu/virtio-iommu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
> index 4620dd221ffd..433f4d2ee956 100644
> --- a/drivers/iommu/virtio-iommu.c
> +++ b/drivers/iommu/virtio-iommu.c
> @@ -839,7 +839,7 @@ static void viommu_put_resv_regions(struct device *dev, struct list_head *head)
> static struct iommu_ops viommu_ops;
> static struct virtio_driver virtio_iommu_drv;
>
> -static int viommu_match_node(struct device *dev, void *data)
> +static int viommu_match_node(struct device *dev, const void *data)
> {
> return dev->parent->fwnode == data;
> }
> --
> 2.22.0
>
On Tue, Jul 02, 2019 at 03:18:03PM +0100, Jean-Philippe Brucker wrote:
> Nathan, thanks for noticing and fixing this.
>
> Joerg, the virtio-iommu driver build failed in next because of a
> dependency on driver-core changes for v5.3. I'm not sure what the best
> practice is in this case, I guess I will resend the driver as applied
> onto the latest driver-core, to have it working in v5.3?
This depends on what the vhost-tree maintainer prefers. I would probably
merge the current driver-core into the virtio-iommu branch and put a
fix on-top.
Regards,
Joerg
On Tue, Jul 02, 2019 at 05:18:17PM +0200, Joerg Roedel wrote:
> On Tue, Jul 02, 2019 at 03:18:03PM +0100, Jean-Philippe Brucker wrote:
> > Nathan, thanks for noticing and fixing this.
> >
> > Joerg, the virtio-iommu driver build failed in next because of a
> > dependency on driver-core changes for v5.3. I'm not sure what the best
> > practice is in this case, I guess I will resend the driver as applied
> > onto the latest driver-core, to have it working in v5.3?
>
> This depends on what the vhost-tree maintainer prefers. I would probably
> merge the current driver-core into the virtio-iommu branch and put a
> fix on-top.
>
>
> Regards,
>
> Joerg
I can drop virtio iommu from my tree. Where's yours? I'd like to take a
last look and send an ack.
--
MST
On Tue, Jul 02, 2019 at 11:23:34AM -0400, Michael S. Tsirkin wrote:
> I can drop virtio iommu from my tree. Where's yours? I'd like to take a
> last look and send an ack.
It is not in my tree yet, because I was waiting for your ack on the
patches wrt. the spec.
Given that the merge window is pretty close I can't promise to take it
into my tree for v5.3 when you ack it, so if it should go upstream this
time its better to keep it in your tree.
Regards,
Joerg
On Tue, Jul 02, 2019 at 05:58:51PM +0200, Joerg Roedel wrote:
> On Tue, Jul 02, 2019 at 11:23:34AM -0400, Michael S. Tsirkin wrote:
> > I can drop virtio iommu from my tree. Where's yours? I'd like to take a
> > last look and send an ack.
>
> It is not in my tree yet, because I was waiting for your ack on the
> patches wrt. the spec.
>
> Given that the merge window is pretty close I can't promise to take it
> into my tree for v5.3 when you ack it, so if it should go upstream this
> time its better to keep it in your tree.
>
>
> Regards,
>
> Joerg
Hmm. But then the merge build fails. I guess I will have to include the
patch in the pull request then?
Hi all,
On Tue, 2 Jul 2019 13:05:59 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
>
> On Tue, Jul 02, 2019 at 05:58:51PM +0200, Joerg Roedel wrote:
> > On Tue, Jul 02, 2019 at 11:23:34AM -0400, Michael S. Tsirkin wrote:
> > > I can drop virtio iommu from my tree. Where's yours? I'd like to take a
> > > last look and send an ack.
> >
> > It is not in my tree yet, because I was waiting for your ack on the
> > patches wrt. the spec.
> >
> > Given that the merge window is pretty close I can't promise to take it
> > into my tree for v5.3 when you ack it, so if it should go upstream this
> > time its better to keep it in your tree.
>
> Hmm. But then the merge build fails. I guess I will have to include the
> patch in the pull request then?
>
All you (and the driver-core maintainer) need to do is make sure you
tell Linus that the merge requires the fix ... he can then apply it to
the merge commit just as I have. Linus has asked that maintainers do
not (in general) cross merge to avoid these (semantic) conflicts.
Sometimes, in more complex cases, it may be necessary for maintainers
to share a (non changing) subset of their trees, but this case is
pretty trivial.
--
Cheers,
Stephen Rothwell
Greg, Stephen, All,
On 02/07/2019 22:41, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 2 Jul 2019 13:05:59 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
>>
>> On Tue, Jul 02, 2019 at 05:58:51PM +0200, Joerg Roedel wrote:
>>> On Tue, Jul 02, 2019 at 11:23:34AM -0400, Michael S. Tsirkin wrote:
>>>> I can drop virtio iommu from my tree. Where's yours? I'd like to take a
>>>> last look and send an ack.
>>>
>>> It is not in my tree yet, because I was waiting for your ack on the
>>> patches wrt. the spec.
>>>
>>> Given that the merge window is pretty close I can't promise to take it
>>> into my tree for v5.3 when you ack it, so if it should go upstream this
>>> time its better to keep it in your tree.
>>
>> Hmm. But then the merge build fails. I guess I will have to include the
>> patch in the pull request then?
>>
>
> All you (and the driver-core maintainer) need to do is make sure you
> tell Linus that the merge requires the fix ... he can then apply it to
> the merge commit just as I have. Linus has asked that maintainers do
> not (in general) cross merge to avoid these (semantic) conflicts.
> Sometimes, in more complex cases, it may be necessary for maintainers
> to share a (non changing) subset of their trees, but this case is
> pretty trivial.
>
Please let me know if there is something I could help with.
Cheers
Suzuki
Hi all,
On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell <[email protected]> wrote:
>
> 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 <[email protected]>
> Date: Mon, 1 Jul 2019 19:07:20 +1000
> Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
> with class_find_device"
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> 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/hwtracing/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;
> }
>
> -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) == 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 <[email protected]>
Date: Mon, 1 Jul 2019 11:28:08 -0700
Subject: [PATCH] coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter const
drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointer 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 <[email protected]>
---
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/hwtracing/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)
void coresight_release_platform_data(struct coresight_platform_data *pdata);
-int coresight_device_fwnode_match(struct device *dev, void *fwnode);
+int coresight_device_fwnode_match(struct device *dev, const void *fwnode);
#endif
--
2.22.0
--
Cheers,
Stephen Rothwell
Hi Stephen,
On Thu, 11 Jul 2019 at 18:53, Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell <[email protected]> wrote:
> >
> > 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 <[email protected]>
> > Date: Mon, 1 Jul 2019 19:07:20 +1000
> > Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
> > with class_find_device"
> >
> > Signed-off-by: Stephen Rothwell <[email protected]>
> > ---
> > 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/hwtracing/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;
> > }
> >
> > -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) == 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).
I have updated my next branch and you shouldn't see this again.
Thanks,
Mathieu
>
> From: Nathan Chancellor <[email protected]>
> Date: Mon, 1 Jul 2019 11:28:08 -0700
> Subject: [PATCH] coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter const
>
> drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointer 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 <[email protected]>
> ---
> 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/hwtracing/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)
>
> void coresight_release_platform_data(struct coresight_platform_data *pdata);
>
> -int coresight_device_fwnode_match(struct device *dev, void *fwnode);
> +int coresight_device_fwnode_match(struct device *dev, const void *fwnode);
>
> #endif
> --
> 2.22.0
>
> --
> Cheers,
> Stephen Rothwell