linux-next: manual merge of the char-misc tree with the driver-core tree

linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]

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 callback
 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/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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Nathan Chancellor]

[-- Attachment #1: Type: text/plain, Size: 2120 bytes --]

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 <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 callback
>  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/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

[-- Attachment #2: 0001-coresight-Make-the-coresight_device_fwnode_match-dec.patch --]
[-- Type: text/plain, Size: 1601 bytes --]

From 2b2dd836a7370d9b33fb0f70515ecd7bc8462c0a Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
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 <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/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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Nathan Chancellor]

[-- Attachment #1: Type: text/plain, Size: 2284 bytes --]

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 <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 callback
>  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/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

[-- Attachment #2: 0001-iommu-virtio-Constify-data-parameter-in-viommu_match.patch --]
[-- Type: text/plain, Size: 1066 bytes --]

From 347a1bbeb8ba757648ceeed1839df101417a3d9f Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
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 <natechancellor@gmail.com>
---
 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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Hi Nathan,

On Mon, 1 Jul 2019 11:39:40 -0700 Nathan Chancellor <natechancellor@gmail.com> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

Hi Nathan,

On Mon, 1 Jul 2019 13:04:18 -0700 Nathan Chancellor <natechancellor@gmail.com> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Jean-Philippe Brucker]

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 <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 callback
> >  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/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 <natechancellor@gmail.com>
> 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 <natechancellor@gmail.com>
> ---
>  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
> 

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Joerg Roedel]

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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Michael S. Tsirkin]

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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Joerg Roedel]

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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Michael S. Tsirkin]

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?

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

Hi all,

On Tue, 2 Jul 2019 13:05:59 -0400 "Michael S. Tsirkin" <mst@redhat.com> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Suzuki K Poulose]

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" <mst@redhat.com> 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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3821 bytes --]

Hi all,

On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <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 callback
>  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/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 <natechancellor@gmail.com>
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 <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/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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Mathieu Poirier]

Hi Stephen,

On Thu, 11 Jul 2019 at 18:53, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <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 callback
> >  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/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 <natechancellor@gmail.com>
> 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 <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/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

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Greg KH]

On Tue, Jul 09, 2019 at 09:20:03AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> > 
> >   drivers/misc/vmw_balloon.c
> > 
> > between commit:
> > 
> >   225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create functions")
> > 
> > from the driver-core tree and commits:
> > 
> >   83a8afa72e9c ("vmw_balloon: Compaction support")
> >   5d1a86ecf328 ("vmw_balloon: Add memory shrinker")
> > 
> > from the char-misc 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/misc/vmw_balloon.c
> > index fdf5ad757226,043eed845246..000000000000
> > --- a/drivers/misc/vmw_balloon.c
> > +++ b/drivers/misc/vmw_balloon.c
> > @@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
> >   	if (x86_hyper_type != X86_HYPER_VMWARE)
> >   		return -ENODEV;
> >   
> > - 	for (page_size = VMW_BALLOON_4K_PAGE;
> > - 	     page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
> > - 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
> > - 
> > - 
> >   	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
> >   
> > + 	error = vmballoon_register_shrinker(&balloon);
> > + 	if (error)
> > + 		goto fail;
> > + 
> >  -	error = vmballoon_debugfs_init(&balloon);
> >  -	if (error)
> >  -		goto fail;
> >  +	vmballoon_debugfs_init(&balloon);
> >   
> > + 	/*
> > + 	 * Initialization of compaction must be done after the call to
> > + 	 * balloon_devinfo_init() .
> > + 	 */
> > + 	balloon_devinfo_init(&balloon.b_dev_info);
> > + 	error = vmballoon_compaction_init(&balloon);
> > + 	if (error)
> > + 		goto fail;
> > + 
> > + 	INIT_LIST_HEAD(&balloon.huge_pages);
> >   	spin_lock_init(&balloon.comm_lock);
> >   	init_rwsem(&balloon.conf_sem);
> >   	balloon.vmci_doorbell = VMCI_INVALID_HANDLE;
> 
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

Ok, I sent off the pull request for the driver core tree now.  I had all
of my other trees merged "first" so that all of the conflicts would
happen just once here.  Hopefully I've pointed out all of the potential
and real problems with this merge.

Ugh, this was a messy one, sorry about all of this, full-tree api
changes and cleanups are a pain at times.

thanks,

greg k-h

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

Hi Tomas,

On Tue, 9 Jul 2019 07:12:34 +0000 "Winkler, Tomas" <tomas.winkler@intel.com> wrote:
>
> Actually I've asked Greg this git expertise question: how the
> **exact** conflict resolution is carried between git trees (before it
> is finally resolved in upstream for all.). For next time If anyone
> has the answer, please let me know.

When I see a conflict, I fix it up and report it, then "git rerere"
will remember the resolution for me so that the next day it is fixed up
automatically.  When Linus merges the same trees he will do the same
(or a similar) merge resolution.  I depend on the maintainers to inform
Linus if the conflict is any anyway difficult to resolve.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: manual merge of the char-misc tree with the driver-core tree

[Winkler, Tomas]

> 
> Hi all,
> 
> On Thu, 20 Jun 2019 15:35:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
> wrote:
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> >   drivers/misc/mei/debugfs.c
> >
> > between commit:
> >
> >   5666d896e838 ("mei: no need to check return value of debugfs_create
> > functions")
> >
> > from the driver-core tree and commit:
> >
> >   b728ddde769c ("mei: Convert to use DEFINE_SHOW_ATTRIBUTE macro")
> >
> > from the char-misc 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/misc/mei/debugfs.c
> > index df6bf8b81936,47cfd5005e1b..000000000000
> > --- a/drivers/misc/mei/debugfs.c
> > +++ b/drivers/misc/mei/debugfs.c
> > @@@ -233,22 -154,46 +154,21 @@@ void mei_dbgfs_deregister(struct
> mei_de
> >    *
> >    * @dev: the mei device structure
> >    * @name: the mei device name
> >  - *
> >  - * Return: 0 on success, <0 on failure.
> >    */
> >  -int mei_dbgfs_register(struct mei_device *dev, const char *name)
> > +void mei_dbgfs_register(struct mei_device *dev, const char *name)
> >   {
> >  -	struct dentry *dir, *f;
> >  +	struct dentry *dir;
> >
> >   	dir = debugfs_create_dir(name, NULL);
> >  -	if (!dir)
> >  -		return -ENOMEM;
> >  -
> >   	dev->dbgfs_dir = dir;
> >
> >  -	f = debugfs_create_file("meclients", S_IRUSR, dir,
> >  -				dev, &mei_dbgfs_meclients_fops);
> >  -	if (!f) {
> >  -		dev_err(dev->dev, "meclients: registration failed\n");
> >  -		goto err;
> >  -	}
> >  -	f = debugfs_create_file("active", S_IRUSR, dir,
> >  -				dev, &mei_dbgfs_active_fops);
> >  -	if (!f) {
> >  -		dev_err(dev->dev, "active: registration failed\n");
> >  -		goto err;
> >  -	}
> >  -	f = debugfs_create_file("devstate", S_IRUSR, dir,
> >  -				dev, &mei_dbgfs_devstate_fops);
> >  -	if (!f) {
> >  -		dev_err(dev->dev, "devstate: registration failed\n");
> >  -		goto err;
> >  -	}
> >  -	f = debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR,
> dir,
> >  -				&dev->allow_fixed_address,
> >  -				&mei_dbgfs_allow_fa_fops);
> >  -	if (!f) {
> >  -		dev_err(dev->dev, "allow_fixed_address: registration
> failed\n");
> >  -		goto err;
> >  -	}
> >  -	return 0;
> >  -err:
> >  -	mei_dbgfs_deregister(dev);
> >  -	return -ENODEV;
> >  +	debugfs_create_file("meclients", S_IRUSR, dir, dev,
> > - 			    &mei_dbgfs_fops_meclients);
> > ++			    &mei_dbgfs_meclients_fops);
> >  +	debugfs_create_file("active", S_IRUSR, dir, dev,
> > - 			    &mei_dbgfs_fops_active);
> > ++			    &mei_dbgfs_active_fops);
> >  +	debugfs_create_file("devstate", S_IRUSR, dir, dev,
> > - 			    &mei_dbgfs_fops_devstate);
> > ++			    &mei_dbgfs_devstate_fops);
> >  +	debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
> >  +			    &dev->allow_fixed_address,
> > - 			    &mei_dbgfs_fops_allow_fa);
> > ++			    &mei_dbgfs_allow_fa_fops);
> >   }
> > -
> 
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

The conflict is resolved correctly,  the conflicts are between Greg's misc-char  and driver-core git trees.
Actually I've asked Greg this git expertise question: how the **exact** conflict resolution is carried between git trees (before it is finally resolved in upstream for all.). 
For next time If anyone has the answer, please let me know.

Thanks
Tomas

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Greg KH]

On Mon, Jul 08, 2019 at 11:25:12PM +0000, Nadav Amit wrote:
> > On Jul 8, 2019, at 4:20 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > Hi all,
> > 
> > On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> Today's linux-next merge of the char-misc tree got a conflict in:
> >> 
> >>  drivers/misc/vmw_balloon.c
> >> 
> >> between commit:
> >> 
> >>  225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create functions")
> >> 
> >> from the driver-core tree and commits:
> >> 
> >>  83a8afa72e9c ("vmw_balloon: Compaction support")
> >>  5d1a86ecf328 ("vmw_balloon: Add memory shrinker")
> >> 
> >> from the char-misc 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/misc/vmw_balloon.c
> >> index fdf5ad757226,043eed845246..000000000000
> >> --- a/drivers/misc/vmw_balloon.c
> >> +++ b/drivers/misc/vmw_balloon.c
> >> @@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
> >>  	if (x86_hyper_type != X86_HYPER_VMWARE)
> >>  		return -ENODEV;
> >> 
> >> - 	for (page_size = VMW_BALLOON_4K_PAGE;
> >> - 	     page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
> >> - 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
> >> - 
> >> - 
> >>  	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
> >> 
> >> + 	error = vmballoon_register_shrinker(&balloon);
> >> + 	if (error)
> >> + 		goto fail;
> >> + 
> >> -	error = vmballoon_debugfs_init(&balloon);
> >> -	if (error)
> >> -		goto fail;
> >> +	vmballoon_debugfs_init(&balloon);
> >> 
> >> + 	/*
> >> + 	 * Initialization of compaction must be done after the call to
> >> + 	 * balloon_devinfo_init() .
> >> + 	 */
> >> + 	balloon_devinfo_init(&balloon.b_dev_info);
> >> + 	error = vmballoon_compaction_init(&balloon);
> >> + 	if (error)
> >> + 		goto fail;
> >> + 
> >> + 	INIT_LIST_HEAD(&balloon.huge_pages);
> >>  	spin_lock_init(&balloon.comm_lock);
> >>  	init_rwsem(&balloon.conf_sem);
> >>  	balloon.vmci_doorbell = VMCI_INVALID_HANDLE;
> > 
> > I am still getting this conflict (the commit ids may have changed).
> > Just a reminder in case you think Linus may need to know.
> 
> Greg,
> 
> Can you please take care of it, as you are the maintainer of char-misc
> and the committer of the patch?

It's hard to "take care" as this is in two different trees.  I'll worry
about it when they start to get merged together in Linus's tree...

thanks,

greg k-h

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3321 bytes --]

Hi all,

On Thu, 20 Jun 2019 15:35:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/mei/debugfs.c
> 
> between commit:
> 
>   5666d896e838 ("mei: no need to check return value of debugfs_create functions")
> 
> from the driver-core tree and commit:
> 
>   b728ddde769c ("mei: Convert to use DEFINE_SHOW_ATTRIBUTE macro")
> 
> from the char-misc 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/misc/mei/debugfs.c
> index df6bf8b81936,47cfd5005e1b..000000000000
> --- a/drivers/misc/mei/debugfs.c
> +++ b/drivers/misc/mei/debugfs.c
> @@@ -233,22 -154,46 +154,21 @@@ void mei_dbgfs_deregister(struct mei_de
>    *
>    * @dev: the mei device structure
>    * @name: the mei device name
>  - *
>  - * Return: 0 on success, <0 on failure.
>    */
>  -int mei_dbgfs_register(struct mei_device *dev, const char *name)
>  +void mei_dbgfs_register(struct mei_device *dev, const char *name)
>   {
>  -	struct dentry *dir, *f;
>  +	struct dentry *dir;
>   
>   	dir = debugfs_create_dir(name, NULL);
>  -	if (!dir)
>  -		return -ENOMEM;
>  -
>   	dev->dbgfs_dir = dir;
>   
>  -	f = debugfs_create_file("meclients", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_meclients_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "meclients: registration failed\n");
>  -		goto err;
>  -	}
>  -	f = debugfs_create_file("active", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_active_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "active: registration failed\n");
>  -		goto err;
>  -	}
>  -	f = debugfs_create_file("devstate", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_devstate_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "devstate: registration failed\n");
>  -		goto err;
>  -	}
>  -	f = debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
>  -				&dev->allow_fixed_address,
>  -				&mei_dbgfs_allow_fa_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
>  -		goto err;
>  -	}
>  -	return 0;
>  -err:
>  -	mei_dbgfs_deregister(dev);
>  -	return -ENODEV;
>  +	debugfs_create_file("meclients", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_meclients);
> ++			    &mei_dbgfs_meclients_fops);
>  +	debugfs_create_file("active", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_active);
> ++			    &mei_dbgfs_active_fops);
>  +	debugfs_create_file("devstate", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_devstate);
> ++			    &mei_dbgfs_devstate_fops);
>  +	debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
>  +			    &dev->allow_fixed_address,
> - 			    &mei_dbgfs_fops_allow_fa);
> ++			    &mei_dbgfs_allow_fa_fops);
>   }
> - 

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Nadav Amit]

> On Jul 8, 2019, at 4:20 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Hi all,
> 
> On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the char-misc tree got a conflict in:
>> 
>>  drivers/misc/vmw_balloon.c
>> 
>> between commit:
>> 
>>  225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create functions")
>> 
>> from the driver-core tree and commits:
>> 
>>  83a8afa72e9c ("vmw_balloon: Compaction support")
>>  5d1a86ecf328 ("vmw_balloon: Add memory shrinker")
>> 
>> from the char-misc 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/misc/vmw_balloon.c
>> index fdf5ad757226,043eed845246..000000000000
>> --- a/drivers/misc/vmw_balloon.c
>> +++ b/drivers/misc/vmw_balloon.c
>> @@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
>>  	if (x86_hyper_type != X86_HYPER_VMWARE)
>>  		return -ENODEV;
>> 
>> - 	for (page_size = VMW_BALLOON_4K_PAGE;
>> - 	     page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
>> - 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
>> - 
>> - 
>>  	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
>> 
>> + 	error = vmballoon_register_shrinker(&balloon);
>> + 	if (error)
>> + 		goto fail;
>> + 
>> -	error = vmballoon_debugfs_init(&balloon);
>> -	if (error)
>> -		goto fail;
>> +	vmballoon_debugfs_init(&balloon);
>> 
>> + 	/*
>> + 	 * Initialization of compaction must be done after the call to
>> + 	 * balloon_devinfo_init() .
>> + 	 */
>> + 	balloon_devinfo_init(&balloon.b_dev_info);
>> + 	error = vmballoon_compaction_init(&balloon);
>> + 	if (error)
>> + 		goto fail;
>> + 
>> + 	INIT_LIST_HEAD(&balloon.huge_pages);
>>  	spin_lock_init(&balloon.comm_lock);
>>  	init_rwsem(&balloon.conf_sem);
>>  	balloon.vmci_doorbell = VMCI_INVALID_HANDLE;
> 
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

Greg,

Can you please take care of it, as you are the maintainer of char-misc
and the committer of the patch?

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2325 bytes --]

Hi all,

On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/vmw_balloon.c
> 
> between commit:
> 
>   225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create functions")
> 
> from the driver-core tree and commits:
> 
>   83a8afa72e9c ("vmw_balloon: Compaction support")
>   5d1a86ecf328 ("vmw_balloon: Add memory shrinker")
> 
> from the char-misc 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/misc/vmw_balloon.c
> index fdf5ad757226,043eed845246..000000000000
> --- a/drivers/misc/vmw_balloon.c
> +++ b/drivers/misc/vmw_balloon.c
> @@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
>   	if (x86_hyper_type != X86_HYPER_VMWARE)
>   		return -ENODEV;
>   
> - 	for (page_size = VMW_BALLOON_4K_PAGE;
> - 	     page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
> - 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
> - 
> - 
>   	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
>   
> + 	error = vmballoon_register_shrinker(&balloon);
> + 	if (error)
> + 		goto fail;
> + 
>  -	error = vmballoon_debugfs_init(&balloon);
>  -	if (error)
>  -		goto fail;
>  +	vmballoon_debugfs_init(&balloon);
>   
> + 	/*
> + 	 * Initialization of compaction must be done after the call to
> + 	 * balloon_devinfo_init() .
> + 	 */
> + 	balloon_devinfo_init(&balloon.b_dev_info);
> + 	error = vmballoon_compaction_init(&balloon);
> + 	if (error)
> + 		goto fail;
> + 
> + 	INIT_LIST_HEAD(&balloon.huge_pages);
>   	spin_lock_init(&balloon.comm_lock);
>   	init_rwsem(&balloon.conf_sem);
>   	balloon.vmci_doorbell = VMCI_INVALID_HANDLE;

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Greg KH]

On Thu, Jun 20, 2019 at 03:35:52PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/mei/debugfs.c
> 
> between commit:
> 
>   5666d896e838 ("mei: no need to check return value of debugfs_create functions")
> 
> from the driver-core tree and commit:
> 
>   b728ddde769c ("mei: Convert to use DEFINE_SHOW_ATTRIBUTE macro")
> 
> from the char-misc 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/misc/mei/debugfs.c
> index df6bf8b81936,47cfd5005e1b..000000000000
> --- a/drivers/misc/mei/debugfs.c
> +++ b/drivers/misc/mei/debugfs.c
> @@@ -233,22 -154,46 +154,21 @@@ void mei_dbgfs_deregister(struct mei_de
>    *
>    * @dev: the mei device structure
>    * @name: the mei device name
>  - *
>  - * Return: 0 on success, <0 on failure.
>    */
>  -int mei_dbgfs_register(struct mei_device *dev, const char *name)
>  +void mei_dbgfs_register(struct mei_device *dev, const char *name)
>   {
>  -	struct dentry *dir, *f;
>  +	struct dentry *dir;
>   
>   	dir = debugfs_create_dir(name, NULL);
>  -	if (!dir)
>  -		return -ENOMEM;
>  -
>   	dev->dbgfs_dir = dir;
>   
>  -	f = debugfs_create_file("meclients", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_meclients_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "meclients: registration failed\n");
>  -		goto err;
>  -	}
>  -	f = debugfs_create_file("active", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_active_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "active: registration failed\n");
>  -		goto err;
>  -	}
>  -	f = debugfs_create_file("devstate", S_IRUSR, dir,
>  -				dev, &mei_dbgfs_devstate_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "devstate: registration failed\n");
>  -		goto err;
>  -	}
>  -	f = debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
>  -				&dev->allow_fixed_address,
>  -				&mei_dbgfs_allow_fa_fops);
>  -	if (!f) {
>  -		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
>  -		goto err;
>  -	}
>  -	return 0;
>  -err:
>  -	mei_dbgfs_deregister(dev);
>  -	return -ENODEV;
>  +	debugfs_create_file("meclients", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_meclients);
> ++			    &mei_dbgfs_meclients_fops);
>  +	debugfs_create_file("active", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_active);
> ++			    &mei_dbgfs_active_fops);
>  +	debugfs_create_file("devstate", S_IRUSR, dir, dev,
> - 			    &mei_dbgfs_fops_devstate);
> ++			    &mei_dbgfs_devstate_fops);
>  +	debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
>  +			    &dev->allow_fixed_address,
> - 			    &mei_dbgfs_fops_allow_fa);
> ++			    &mei_dbgfs_allow_fa_fops);
>   }
> - 


Looks good to me, thanks!

greg k-h

linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2887 bytes --]

Hi all,

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

  drivers/misc/mei/debugfs.c

between commit:

  5666d896e838 ("mei: no need to check return value of debugfs_create functions")

from the driver-core tree and commit:

  b728ddde769c ("mei: Convert to use DEFINE_SHOW_ATTRIBUTE macro")

from the char-misc 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/misc/mei/debugfs.c
index df6bf8b81936,47cfd5005e1b..000000000000
--- a/drivers/misc/mei/debugfs.c
+++ b/drivers/misc/mei/debugfs.c
@@@ -233,22 -154,46 +154,21 @@@ void mei_dbgfs_deregister(struct mei_de
   *
   * @dev: the mei device structure
   * @name: the mei device name
 - *
 - * Return: 0 on success, <0 on failure.
   */
 -int mei_dbgfs_register(struct mei_device *dev, const char *name)
 +void mei_dbgfs_register(struct mei_device *dev, const char *name)
  {
 -	struct dentry *dir, *f;
 +	struct dentry *dir;
  
  	dir = debugfs_create_dir(name, NULL);
 -	if (!dir)
 -		return -ENOMEM;
 -
  	dev->dbgfs_dir = dir;
  
 -	f = debugfs_create_file("meclients", S_IRUSR, dir,
 -				dev, &mei_dbgfs_meclients_fops);
 -	if (!f) {
 -		dev_err(dev->dev, "meclients: registration failed\n");
 -		goto err;
 -	}
 -	f = debugfs_create_file("active", S_IRUSR, dir,
 -				dev, &mei_dbgfs_active_fops);
 -	if (!f) {
 -		dev_err(dev->dev, "active: registration failed\n");
 -		goto err;
 -	}
 -	f = debugfs_create_file("devstate", S_IRUSR, dir,
 -				dev, &mei_dbgfs_devstate_fops);
 -	if (!f) {
 -		dev_err(dev->dev, "devstate: registration failed\n");
 -		goto err;
 -	}
 -	f = debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
 -				&dev->allow_fixed_address,
 -				&mei_dbgfs_allow_fa_fops);
 -	if (!f) {
 -		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
 -		goto err;
 -	}
 -	return 0;
 -err:
 -	mei_dbgfs_deregister(dev);
 -	return -ENODEV;
 +	debugfs_create_file("meclients", S_IRUSR, dir, dev,
- 			    &mei_dbgfs_fops_meclients);
++			    &mei_dbgfs_meclients_fops);
 +	debugfs_create_file("active", S_IRUSR, dir, dev,
- 			    &mei_dbgfs_fops_active);
++			    &mei_dbgfs_active_fops);
 +	debugfs_create_file("devstate", S_IRUSR, dir, dev,
- 			    &mei_dbgfs_fops_devstate);
++			    &mei_dbgfs_devstate_fops);
 +	debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
 +			    &dev->allow_fixed_address,
- 			    &mei_dbgfs_fops_allow_fa);
++			    &mei_dbgfs_allow_fa_fops);
  }
- 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

[Greg KH]

On Thu, Jun 13, 2019 at 03:53:44PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/vmw_balloon.c
> 
> between commit:
> 
>   225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create functions")
> 
> from the driver-core tree and commits:
> 
>   83a8afa72e9c ("vmw_balloon: Compaction support")
>   5d1a86ecf328 ("vmw_balloon: Add memory shrinker")
> 
> from the char-misc 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/misc/vmw_balloon.c
> index fdf5ad757226,043eed845246..000000000000
> --- a/drivers/misc/vmw_balloon.c
> +++ b/drivers/misc/vmw_balloon.c
> @@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
>   	if (x86_hyper_type != X86_HYPER_VMWARE)
>   		return -ENODEV;
>   
> - 	for (page_size = VMW_BALLOON_4K_PAGE;
> - 	     page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
> - 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
> - 
> - 
>   	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
>   
> + 	error = vmballoon_register_shrinker(&balloon);
> + 	if (error)
> + 		goto fail;
> + 
>  -	error = vmballoon_debugfs_init(&balloon);
>  -	if (error)
>  -		goto fail;
>  +	vmballoon_debugfs_init(&balloon);
>   
> + 	/*
> + 	 * Initialization of compaction must be done after the call to
> + 	 * balloon_devinfo_init() .
> + 	 */
> + 	balloon_devinfo_init(&balloon.b_dev_info);
> + 	error = vmballoon_compaction_init(&balloon);
> + 	if (error)
> + 		goto fail;
> + 
> + 	INIT_LIST_HEAD(&balloon.huge_pages);
>   	spin_lock_init(&balloon.comm_lock);
>   	init_rwsem(&balloon.conf_sem);
>   	balloon.vmci_doorbell = VMCI_INVALID_HANDLE;


Looks good, thanks!

greg k-h

linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1949 bytes --]

Hi all,

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

  drivers/misc/vmw_balloon.c

between commit:

  225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create functions")

from the driver-core tree and commits:

  83a8afa72e9c ("vmw_balloon: Compaction support")
  5d1a86ecf328 ("vmw_balloon: Add memory shrinker")

from the char-misc 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/misc/vmw_balloon.c
index fdf5ad757226,043eed845246..000000000000
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
  	if (x86_hyper_type != X86_HYPER_VMWARE)
  		return -ENODEV;
  
- 	for (page_size = VMW_BALLOON_4K_PAGE;
- 	     page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
- 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
- 
- 
  	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
  
+ 	error = vmballoon_register_shrinker(&balloon);
+ 	if (error)
+ 		goto fail;
+ 
 -	error = vmballoon_debugfs_init(&balloon);
 -	if (error)
 -		goto fail;
 +	vmballoon_debugfs_init(&balloon);
  
+ 	/*
+ 	 * Initialization of compaction must be done after the call to
+ 	 * balloon_devinfo_init() .
+ 	 */
+ 	balloon_devinfo_init(&balloon.b_dev_info);
+ 	error = vmballoon_compaction_init(&balloon);
+ 	if (error)
+ 		goto fail;
+ 
+ 	INIT_LIST_HEAD(&balloon.huge_pages);
  	spin_lock_init(&balloon.comm_lock);
  	init_rwsem(&balloon.conf_sem);
  	balloon.vmci_doorbell = VMCI_INVALID_HANDLE;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the char-misc tree with the driver-core tree

[Stephen Rothwell]

Hi all,

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

  Documentation/driver-api/index.rst

between commit:

  113ccc38378b ("firmware: revamp firmware documentation")

from the driver-core tree and commit:

  cadf8106661c ("doc: convert UIO howto from docbook to sphinx")

from the char-misc 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 Documentation/driver-api/index.rst
index 2359618746ec,c5a1cd0a4ae7..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -31,7 -30,7 +31,8 @@@ available subsections can be seen below
     miscellaneous
     vme
     80211/index
 +   firmware/index
+    uio-howto
  
  .. only::  subproject and html