Hi
Am 18.07.25 um 06:41 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/virtio/virtgpu_prime.c
between commit:
0ecfb8ddb953 ("Revert "drm/virtio: Use dma_buf from GEM object instance"")
from the drm-misc-fixes tree and comm
Hi Stephen,
On Wed, Nov 22, 2023 at 1:29 AM Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/accel/ivpu/ivpu_hw_37xx.c
>
> between commit:
>
> 3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset")
>
> from the drm-misc-fixes tree an
Hi all,
On Tue, 27 Jun 2023 11:54:32 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> include/drm/gpu_scheduler.h
>
> between commit:
>
> db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from
> drm_sched_fence_scheduled()")
>
Hi Dave,
On Wed, 27 Jul 2022 13:24:45 +1000 Dave Airlie wrote:
>
> My assumption is I fix this on sending my -next tree to Linus with a
> resolution I create at that time?
>
> Is there another option, we have this fixed in out drm-tip tree already.
Sounds good, no problem.
--
Cheers,
Stephen
On Wed, 27 Jul 2022 at 12:55, Stephen Rothwell wrote:
>
> Hi all,
>
> On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell
> wrote:
> >
> > On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> > wrote:
> > >
> > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > > >
> > > > Today's linux-next
Hi all,
On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell
wrote:
>
> On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> wrote:
> >
> > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > >drivers/gpu/drm/amd
Hi Stephen,
On Mon, Jul 18, 2022 at 1:49 AM Stephen Rothwell wrote:
> On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> wrote:
> > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > >drivers/gpu/drm/amd/amdgpu/
Hi all,
On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
wrote:
>
> Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> >
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> >drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> >
> > between commit:
> >
> >925b6e59138c ("Rever
Hi Stephen,
Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"")
from the drm-misc-fixes tre
Hi all,
On Fri, 18 Mar 2022 11:55:44 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/bridge/Kconfig
>
> between commit:
>
> 3c3384050d68 ("drm: Don't make DRM_PANEL_BRIDGE dependent on
> DRM_KMS_HELPERS")
>
> from the drm
Hi Stephen,
Am 22.12.21 um 04:50 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/nouveau/nouveau_fence.c
between commit:
67f74302f45d ("drm/nouveau: wait for the exclusive fence after the shared ones
v2")
from the drm-misc
Hi Maxime,
On Tue, 30 Nov 2021 09:58:31 +0100 Maxime Ripard wrote:
>
> Unfortunately the merge resolution isn't entirely correct :/
>
> There's multiple conflicts between those two branches on that file, but
> things went wrong between 16e101051f32 and 0c980a006d3f
>
> The first one changes the
Hi Stephen,
On Tue, Nov 30, 2021 at 10:33:53AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/vc4/vc4_kms.c
>
> between commits:
>
> f927767978d2 ("drm/vc4: kms: Fix return code check")
> d354699e2292 ("drm/vc4
On 18/03/2021 03:02, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/omapdrm/dss/dsi.c
between commit:
690911544275 ("drm/omap: dsi: fix unsigned expression compared with zero")
from the drm-misc-fixes tree and commit:
bbd
On Mon, Sep 16, 2019 at 1:30 PM Vasily Khoruzhick wrote:
>
> On Sun, Sep 15, 2019 at 2:18 PM Mark Brown wrote:
> >
> > Hi all,
>
> Hi Mark,
>
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > drivers/gpu/drm/lima/lima_gem.c
> >
> > between commit:
> >
> > 21670bd78a25001
On Sun, Sep 15, 2019 at 2:18 PM Mark Brown wrote:
>
> Hi all,
Hi Mark,
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/lima/lima_gem.c
>
> between commit:
>
> 21670bd78a25001cf8e ("drm/lima: fix lima_gem_wait() return value")
>
> from the drm-misc-fixes tree
On Mon, Aug 26, 2019 at 01:06:37PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c
>
> between commit:
>
> 51a44a28eefd ("drm/komeda: Add missing of_node_get() call")
>
> from the d
17 matches
Mail list logo
