Re: linux-next: manual merge of the char-misc tree with the drm-intel tree

Hi all, On Fri, 5 Nov 2021 12:51:22 +1100 Stephen Rothwell wrote: > > On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > > > > between commit: > > > >

Re: linux-next: manual merge of the char-misc tree with the drm-intel tree

Hi all, On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > > between commit: > > 5740211ea442 ("drm/i915/dmabuf: fix broken build") > > from the drm-intel tree

Re: linux-next: manual merge of the char-misc tree with the drm-intel tree

On Thu, Oct 28, 2021 at 06:27:53PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > > between commit: > > 5740211ea442 ("drm/i915/dmabuf: fix broken build") > > from the drm-intel

linux-next: manual merge of the char-misc tree with the drm-intel tree

Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c between commit: 5740211ea442 ("drm/i915/dmabuf: fix broken build") from the drm-intel tree and commit: 16b0314aa746 ("dma-buf: move dma-buf symbols into the DMA_BUF modul