Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the vfio tree with the drm tree
@ 2021-04-15  6:47 Stephen Rothwell
  2021-04-15 13:08 ` Jason Gunthorpe
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-04-15  6:47 UTC (permalink / raw)
  To: Alex Williamson, Dave Airlie, DRI
  Cc: Jani Nikula, Jason Gunthorpe, Jason Gunthorpe,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Thomas Zimmermann


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

Hi all,

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

  drivers/gpu/drm/i915/gvt/gvt.c

between commit:

  9ff06c385300 ("drm/i915/gvt: Remove references to struct drm_device.pdev")

from the drm tree and commit:

  383987fd15ba ("vfio/gvt: Use mdev_get_type_group_id()")

from the vfio tree.

I fixed it up (I used the latter version) 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

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the vfio tree with the drm tree
  2021-04-15  6:47 linux-next: manual merge of the vfio tree with the drm tree Stephen Rothwell
@ 2021-04-15 13:08 ` Jason Gunthorpe
  2021-04-15 19:20   ` Alex Williamson
  0 siblings, 1 reply; 3+ messages in thread
From: Jason Gunthorpe @ 2021-04-15 13:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Williamson, Dave Airlie, DRI, Jani Nikula,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Thomas Zimmermann

On Thu, Apr 15, 2021 at 04:47:34PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vfio tree got a conflict in:
> 
>   drivers/gpu/drm/i915/gvt/gvt.c
> 
> between commit:
> 
>   9ff06c385300 ("drm/i915/gvt: Remove references to struct drm_device.pdev")
> 
> from the drm tree and commit:
> 
>   383987fd15ba ("vfio/gvt: Use mdev_get_type_group_id()")
> 
> from the vfio tree.
> 
> I fixed it up (I used the latter version) and can carry the fix as
> necessary.

Yes that is right, thank you

Jason

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the vfio tree with the drm tree
  2021-04-15 13:08 ` Jason Gunthorpe
@ 2021-04-15 19:20   ` Alex Williamson
  0 siblings, 0 replies; 3+ messages in thread
From: Alex Williamson @ 2021-04-15 19:20 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Stephen Rothwell, Dave Airlie, DRI, Jani Nikula,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Thomas Zimmermann

On Thu, 15 Apr 2021 10:08:55 -0300
Jason Gunthorpe <jgg@ziepe.ca> wrote:

> On Thu, Apr 15, 2021 at 04:47:34PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the vfio tree got a conflict in:
> > 
> >   drivers/gpu/drm/i915/gvt/gvt.c
> > 
> > between commit:
> > 
> >   9ff06c385300 ("drm/i915/gvt: Remove references to struct drm_device.pdev")
> > 
> > from the drm tree and commit:
> > 
> >   383987fd15ba ("vfio/gvt: Use mdev_get_type_group_id()")
> > 
> > from the vfio tree.
> > 
> > I fixed it up (I used the latter version) and can carry the fix as
> > necessary.  
> 
> Yes that is right, thank you

Yep, thanks!

Alex


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-15  6:47 linux-next: manual merge of the vfio tree with the drm tree Stephen Rothwell
2021-04-15 13:08 ` Jason Gunthorpe
2021-04-15 19:20   ` Alex Williamson

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git