Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, 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 and commits: 3de6d9597892 ("accel/ivpu: Pass D0i3 residency time to the VP

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/accel/ivpu/ivpu_fw.c between commit: 645d694559ca ("accel/ivpu: Use cached buffers for FW loading") from the drm-misc-fixes tree and commit: 53d98420f5f9 ("accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init()") fr

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, 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()") from the drm-misc-fixes tree and commit: 539f9ee4b52a ("drm/scheduler: properly

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_job.c between commit: b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID") from the drm-misc-fixes tree and commits: c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgp

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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/

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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 tree and commit: 5e3f1e7729ec ("drm/amdgpu: fix start calculatio

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, 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-misc-fixes tree and commit: 803abfd8dda5 ("drm: bridge: fix unmet dependency on

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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-fixes tree and commit: 40298cb45071 ("drm/nouveau: use the n

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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: kms: Don't duplicate pending commit") from the drm-misc-fixes tree and commit: 16e101051f32 (

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_panel_orientation_quirks.c between commit: def0c3697287 ("drm: panel-orientation-quirks: Add quirk for Aya Neo 2021") from the drm-misc-fixes tree and commits: 072e70d52372 ("drm: panel-orientation-q

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/vc4/vc4_hdmi.c between commit: 9984d6664ce9 ("drm/vc4: hdmi: Make sure the controller is powered in detect") from the drm-misc-fixes tree and commit: 6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod") fro

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/vc4/vc4_plane.c between commit: 35d65ab3fdba ("drm/vc4: plane: Remove redundant assignment") from the drm-misc-fixes tree and commit: 5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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: bbd13d6a7b2e ("drm/omap: dsi: fix unreachable code in

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_gem.c between commit: 8490d6a7e0a0 ("drm: hold gem reference until object is no longer accessed") from the drm-misc-fixes tree and commit: be6ee102341b ("drm: remove _unlocked suffix in drm_gem_objec

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: include/linux/dma-buf.h between commit: 6f49c2515e22 ("dma-buf: fix documentation build warnings") from the drm-misc-fixes tree and commit: 09606b5446c2 ("dma-buf: add peer2peer flag") from the drm tree. I fixed it up

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/virtio/virtgpu_object.c between commit: 6be7e0733548 ("drm/virtio: fix mmap page attributes") from the drm-misc-fixes tree and commit: 18b39fb975b7 ("drm/virtio: add virtio_gpu_is_shmem helper") from th

Re: [Intel-gfx] linux-next: manual merge of the drm tree with 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

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

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 drm-misc-fixes tree and commit: 8965ad8433ea ("drm/komeda: Enable dual-link support")

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/meson/meson_crtc.c between commit: 47ebfb6ed13e ("drm/meson: Fixes for drm_crtc_vblank_on/off support") from the drm-misc-fixes tree and commit: f9a2348196d1 ("drm/meson: Support Overlay plane for video

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/sun4i/sun4i_tcon.c between commit: e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit") from the drm-misc-fixes tree and commit: 34d698f6e349 ("drm/sun4i: Add has_channel_0 TCON qui

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_edid.c between commit: 4b4df570b41d ("drm: Update edid-derived drm_display_info fields at edid property set [v2]") from the drm-misc-fixes tree and commit: c945b8c14bb7 ("drm/edid: build ELD in drm_

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: include/drm/drm_atomic.h between commit: 7e9081c5aac7 ("drm/fence: fix memory overwrite when setting out_fence fd") from the drm-misc-fixes tree and commit: bdc571464c49 ("drm/atomic: Clean up wait_for_vblanks, v2.")