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

Hi Stephen, On Thu, 11 Jul 2019 at 18:53, Stephen Rothwell wrote: > > Hi all, > > On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > > drivers/hwtracing/coresight/of_coresight.c > > > > between commit: >

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

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 > wrote: > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > > drivers/misc/vmw_balloon.c > > > > between commit: > > > > 225afca

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

Hi all, On Mon, 1 Jul 2019 19:09:40 +1000 Stephen Rothwell 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

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

Hi Tomas, On Tue, 9 Jul 2019 07:12:34 + "Winkler, Tomas" 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, ple

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

> > Hi all, > > On Thu, 20 Jun 2019 15:35:52 +1000 Stephen Rothwell > 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 > > fu

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

On Mon, Jul 08, 2019 at 11:25:12PM +, Nadav Amit wrote: > > On Jul 8, 2019, at 4:20 PM, Stephen Rothwell wrote: > > > > Hi all, > > > > On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell > > wrote: > >> Today's linux-next merge of the char-misc tree got a conflict in: > >> > >> drivers/

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

Hi all, On Thu, 20 Jun 2019 15:35:52 +1000 Stephen Rothwell 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

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

> On Jul 8, 2019, at 4:20 PM, Stephen Rothwell wrote: > > Hi all, > > On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell > 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:

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

Hi all, On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell 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") > > f

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

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" 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 f

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

Hi all, On Tue, 2 Jul 2019 13:05:59 -0400 "Michael S. Tsirkin" 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 > > > las

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

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 you

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

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 pret

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

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

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

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

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

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 >

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

Hi Nathan, On Mon, 1 Jul 2019 13:04:18 -0700 Nathan Chancellor 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 > clas

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

Hi Nathan, On Mon, 1 Jul 2019 11:39:40 -0700 Nathan Chancellor 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 pgpk

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

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_fin

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

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_fin

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

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") > > fr

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

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")