Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Geert, On Tue, 30 Mar 2021 09:36:57 +0200 Geert Uytterhoeven wrote: > > On Mon, Mar 29, 2021 at 4:16 AM Stephen Rothwell > wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > > > > between commits: > > > >

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Stephen, On Mon, Mar 29, 2021 at 4:16 AM Stephen Rothwell wrote: > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > > between commits: > > 9adb125dde69 ("drm/amdgpu: re-enable suspend phase 2 for S0ix") > 4021229e32bd

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c between commits: 9adb125dde69 ("drm/amdgpu: re-enable suspend phase 2 for S0ix") 4021229e32bd ("drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend") 9bb735abcbd8 ("drm/amdgpu:

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi all, On Mon, 1 Feb 2021 12:30:12 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h > > between commit: > > a119f87b86bc ("Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"") > > from

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h between commit: a119f87b86bc ("Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"") from Linus' tree and commit: d8a0b8dd690b ("drm/amd/pm: add pptable_funcs

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h between commits: 3c517ca5212f ("Revert "drm/amdgpu/disply: fix documentation warnings in display manager"") a7ddd22151fc ("Revert "drm/amd/display: Expose new CRC window

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c between commit: b19515253623 ("drm/amd/pm: setup APU dpm clock table in SMU HW initialization") from the Linus tree and commits: 82cac71c1b64 ("drm/amd/pm: put Navi1X umc cdr

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c between commit: 31ecebee9c36 ("drm/amd/display: Defer cursor lock until after VUPDATE") from Linus' tree and commits:

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi all, On Thu, 22 Mar 2018 17:37:22 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got conflicts in several amdgpu > files because there are a set of (mostly identical) patches that appear > Linus' tree and the drm tree. In each case I just

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi all, On Thu, 22 Mar 2018 17:37:22 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got conflicts in several amdgpu > files because there are a set of (mostly identical) patches that appear > Linus' tree and the drm tree. In each case I just used the version fo >

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_drv.h drivers/gpu/drm/vmwgfx/vmwgfx_kms.c between commit: 140bcaa23a1c ("drm/vmwgfx: Fix black screen and device errors when running without fbdev") from Linus' tree and commit:

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_drv.h drivers/gpu/drm/vmwgfx/vmwgfx_kms.c between commit: 140bcaa23a1c ("drm/vmwgfx: Fix black screen and device errors when running without fbdev") from Linus' tree and commit:

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got conflicts in several amdgpu files because there are a set of (mostly identical) patches that appear Linus' tree and the drm tree. In each case I just used the version fo the file from the drm tree. You should do a test merge between your tree

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got conflicts in several amdgpu files because there are a set of (mostly identical) patches that appear Linus' tree and the drm tree. In each case I just used the version fo the file from the drm tree. You should do a test merge between your tree

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c between commit: a0aaa03062be ("drm/amd/powerplay: fix power over limit on Fiji") from the Linus' and commit: a5278e511dce ("drm/amd/pp: Revert gfx/compute profile switch

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c between commit: a0aaa03062be ("drm/amd/powerplay: fix power over limit on Fiji") from the Linus' and commit: a5278e511dce ("drm/amd/pp: Revert gfx/compute profile switch

Re: linux-next: manual merge of the drm tree with Linus' tree

On Mon, Feb 19, 2018 at 10:10:50AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/intel_breadcrumbs.c > > between commit: > > 117172c8f9d4 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers") > > from

Re: linux-next: manual merge of the drm tree with Linus' tree

On Mon, Feb 19, 2018 at 10:10:50AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/intel_breadcrumbs.c > > between commit: > > 117172c8f9d4 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers") > > from

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_breadcrumbs.c between commit: 117172c8f9d4 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers") from Linus' tree and commit: b7a3f33bd5ab ("drm/i915/breadcrumbs: Drop request reference for

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_breadcrumbs.c between commit: 117172c8f9d4 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers") from Linus' tree and commit: b7a3f33bd5ab ("drm/i915/breadcrumbs: Drop request reference for

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_pmu.h between commit: 4c83f0a788cc ("drm/i915/pmu: Fix sleep under atomic in RC6 readout") from Linus' tree and commit: 109ec558370f ("drm/i915/pmu: Only enumerate available counters in

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_pmu.h between commit: 4c83f0a788cc ("drm/i915/pmu: Fix sleep under atomic in RC6 readout") from Linus' tree and commit: 109ec558370f ("drm/i915/pmu: Only enumerate available counters in

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/tegra/sor.c between commit: d780537f9b49 ("drm/tegra: sor: Fix hang on Tegra124 eDP") from Linus' tree and commit: 1087fac18b8e ("drm/tegra: dc: Use direct offset to plane registers") from the drm

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/tegra/sor.c between commit: d780537f9b49 ("drm/tegra: sor: Fix hang on Tegra124 eDP") from Linus' tree and commit: 1087fac18b8e ("drm/tegra: dc: Use direct offset to plane registers") from the drm

linux-next: manual merge of the drm tree with Linus' tree

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c between commits: 0290c4ca2536 ("of: overlay: rename identifiers to more reflect what

linux-next: manual merge of the drm tree with Linus' tree

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c between commits: 0290c4ca2536 ("of: overlay: rename identifiers to more reflect what

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_runtime_pm.c between commit: 2a8408e537250 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume") from Linus' tree and commit: 57522c4c87de2 ("drm/i915/cnl: Reprogram DMC firmware after

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_runtime_pm.c between commit: 2a8408e537250 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume") from Linus' tree and commit: 57522c4c87de2 ("drm/i915/cnl: Reprogram DMC firmware after

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/scheduler/gpu_scheduler.c between commit: c94501279bb191c ("Revert "drm/amdgpu: discard commands of killed processes"") from Linus' tree (it even made it into -rc6 over a week ago!) and the fixes it

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/scheduler/gpu_scheduler.c between commit: c94501279bb191c ("Revert "drm/amdgpu: discard commands of killed processes"") from Linus' tree (it even made it into -rc6 over a week ago!) and the fixes it

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/ipuv3-plane.c between commit: 5be5dd38d462 ("drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base plane") from Linus' tree and commit: 58dff39904c0 ("drm/imx: ipuv3-plane: use fb local

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/ipuv3-plane.c between commit: 5be5dd38d462 ("drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base plane") from Linus' tree and commit: 58dff39904c0 ("drm/imx: ipuv3-plane: use fb local

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/nouveau/nv50_display.c between commit: 4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to modeset actions") from Linus' tree and commit: ca814b25538a ("drm/vblank: Consistent

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/nouveau/nv50_display.c between commit: 4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to modeset actions") from Linus' tree and commit: ca814b25538a ("drm/vblank: Consistent

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi all, On Mon, 24 Jul 2017 12:06:05 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > MAINTAINERS > > between commit: > > 82abbea734d6 ("MAINTAINERS: fix alphabetical ordering") > > from Linus' tree and commit: > >

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi all, On Mon, 24 Jul 2017 12:06:05 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > MAINTAINERS > > between commit: > > 82abbea734d6 ("MAINTAINERS: fix alphabetical ordering") > > from Linus' tree and commit: > > 3589211e9b03

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: MAINTAINERS between commit: 82abbea734d6 ("MAINTAINERS: fix alphabetical ordering") from Linus' tree and commit: 3589211e9b03 ("drm/tinydrm: Add RePaper e-ink driver") from the drm tree. I fixed it up (see below) and

linux-next: manual merge of the drm tree with Linus' tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: MAINTAINERS between commit: 82abbea734d6 ("MAINTAINERS: fix alphabetical ordering") from Linus' tree and commit: 3589211e9b03 ("drm/tinydrm: Add RePaper e-ink driver") from the drm tree. I fixed it up (see below) and

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c between commit: 8001b7541aa7 ("drm/i915/dp: rename rate_to_index() to intel_dp_rate_index() and reuse") from Linus' tree and commit: 3194102439f6 ("drm/i915/dp: use known correct array

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c between commit: 8001b7541aa7 ("drm/i915/dp: rename rate_to_index() to intel_dp_rate_index() and reuse") from Linus' tree and commit: 3194102439f6 ("drm/i915/dp: use known correct array

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/vmwgfx/vmwgfx_fence.c between commit: f7652afa8ead ("drm/vmwgfx: Type-check lookups of fence objects") from Linus' tree and commit: 8dfe162ac74f ("gpu: drm: drivers: Convert printk(KERN_ to pr_") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/vmwgfx/vmwgfx_fence.c between commit: f7652afa8ead ("drm/vmwgfx: Type-check lookups of fence objects") from Linus' tree and commit: 8dfe162ac74f ("gpu: drm: drivers: Convert printk(KERN_ to pr_") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: lib/Kconfig between commit: 44091d29f207 ("lib: Introduce priority array area manager") from Linus' tree and commit: cf4a7207b1cb ("lib: Add a simple prime number generator") from the drm tree. I fixed it up (see

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: lib/Kconfig between commit: 44091d29f207 ("lib: Introduce priority array area manager") from Linus' tree and commit: cf4a7207b1cb ("lib: Add a simple prime number generator") from the drm tree. I fixed it up (see

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET") from Linus' tree and commit: 43968d7b806d ("drm: Extract drm_plane.[hc]") from the drm tree. I fixed it up (the

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET") from Linus' tree and commit: 43968d7b806d ("drm: Extract drm_plane.[hc]") from the drm tree. I fixed it up (the

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Stephen, Am Dienstag, den 20.09.2016, 12:42 +1000 schrieb Stephen Rothwell: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/imx/ipuv3-crtc.c > > between commit: > > a474478642d5 ("drm/imx: fix crtc vblank state regression") > > from

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Stephen, Am Dienstag, den 20.09.2016, 12:42 +1000 schrieb Stephen Rothwell: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/imx/ipuv3-crtc.c > > between commit: > > a474478642d5 ("drm/imx: fix crtc vblank state regression") > > from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/ipuv3-crtc.c between commit: a474478642d5 ("drm/imx: fix crtc vblank state regression") from Linus' tree and commit: 5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag")

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/ipuv3-crtc.c between commit: a474478642d5 ("drm/imx: fix crtc vblank state regression") from Linus' tree and commit: 5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag")

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu.h between commit: 566153874951 ("drm/amdgpu: fix lru size grouping v2") from Linus' tree and commit: c632d7994360 ("amdgpu: move ttm stuff to amdgpu_ttm.h") from the drm tree. I

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu.h between commit: 566153874951 ("drm/amdgpu: fix lru size grouping v2") from Linus' tree and commit: c632d7994360 ("amdgpu: move ttm stuff to amdgpu_ttm.h") from the drm tree. I

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET") from Linus' tree and commit: f837297ad824 ("drm: Add DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags v2") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET") from Linus' tree and commit: f837297ad824 ("drm: Add DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags v2") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_debugfs.c between commit: 194dc870a589 ("Add braces to avoid "ambiguous ‘else’" compiler warnings") from Linus' tree and commit: 24f1d3cc0997 ("drm/i915: Refactor execlists default context

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_debugfs.c between commit: 194dc870a589 ("Add braces to avoid "ambiguous ‘else’" compiler warnings") from Linus' tree and commit: 24f1d3cc0997 ("drm/i915: Refactor execlists default context

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo.c between commit: 56fc350224f1 ("drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail") from Linus' tree and commits: c3ea576e0583 ("drm/ttm: add optional LRU removal callback v2")

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo.c between commit: 56fc350224f1 ("drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail") from Linus' tree and commits: c3ea576e0583 ("drm/ttm: add optional LRU removal callback v2")

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c between commit: 562e2689baeb ("amdgpu/uvd: add uvd fw version for amdgpu") from Linus' tree and commit: c036554170fc ("drm/amdgpu: handle more than 10 UVD sessions (v2)") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c between commit: 562e2689baeb ("amdgpu/uvd: add uvd fw version for amdgpu") from Linus' tree and commit: c036554170fc ("drm/amdgpu: handle more than 10 UVD sessions (v2)") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/sti/sti_hqvdp.c between commit: f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()") from Linus' tree and commit: 52807ae90e76 ("drm/sti: use u32 to store DMA addresses") from the

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/sti/sti_hqvdp.c between commit: f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()") from Linus' tree and commit: 52807ae90e76 ("drm/sti: use u32 to store DMA addresses") from the

Re: linux-next: manual merge of the drm tree with Linus' tree

Stephen, thanks a lot for addressing that conflict. Replying top-style on purpose. In the future such type of conflicts should be resolvable automatically through a git conflict resolution hook that would use Coccinelle if present when it detects a patch with Coccinelle SmPL grammar has been

Re: linux-next: manual merge of the drm tree with Linus' tree

Stephen, thanks a lot for addressing that conflict. Replying top-style on purpose. In the future such type of conflicts should be resolvable automatically through a git conflict resolution hook that would use Coccinelle if present when it detects a patch with Coccinelle SmPL grammar has been

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_display.c between commit: e1d09dc0ccc6 ("drm/amdgpu: Don't hang in amdgpu_flip_work_func on disabled crtc.") from Linus' tree and commit: 6bd9e877ce53 ("drm/amdgpu: Move MMIO flip

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_display.c between commit: e1d09dc0ccc6 ("drm/amdgpu: Don't hang in amdgpu_flip_work_func on disabled crtc.") from Linus' tree and commit: 6bd9e877ce53 ("drm/amdgpu: Move MMIO flip

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/imx-drm-core.c between commit: 3f3a7280d4ca ("GPU-DRM-IMX: Delete an unnecessary check before drm_fbdev_cma_restore_mode()") from Linus' tree and commit: c1ff5a7aa3c3 ("drm/imx: Remove local fbdev

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/imx-drm-core.c between commit: 3f3a7280d4ca ("GPU-DRM-IMX: Delete an unnecessary check before drm_fbdev_cma_restore_mode()") from Linus' tree and commit: c1ff5a7aa3c3 ("drm/imx: Remove local fbdev

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/amd/amdgpu/dce_v10_0.c drivers/gpu/drm/amd/amdgpu/dce_v11_0.c drivers/gpu/drm/amd/amdgpu/dce_v8_0.c between commit: f6c7aba47bcc ("drm/amdgpu: Keep the pflip interrupts always enabled v7") from Linus'

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/amd/amdgpu/dce_v10_0.c drivers/gpu/drm/amd/amdgpu/dce_v11_0.c drivers/gpu/drm/amd/amdgpu/dce_v8_0.c between commit: f6c7aba47bcc ("drm/amdgpu: Keep the pflip interrupts always enabled v7") from Linus'

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 5677d67ae394 ("drm: Stop resetting connector state to unknown") from Linus' tree and commit: 6295d607ad34 ("drm: Add modeset object iterators") from the drm tree. I fixed

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 5677d67ae394 (drm: Stop resetting connector state to unknown) from Linus' tree and commit: 6295d607ad34 (drm: Add modeset object iterators) from the drm tree. I fixed it up

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Stephen & Dave, indeed RADEON_INFO_VA_UNMAP_WORKING was added to 4.1 to indicate that a certain kernel bug is fixed now and we can remove the user space workaround. And RADEON_INFO_GPU_RESET_COUNTER was stashed to be merged in 4.2 as new feature. Annoying but harmless and Stephen's

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Stephen Dave, indeed RADEON_INFO_VA_UNMAP_WORKING was added to 4.1 to indicate that a certain kernel bug is fixed now and we can remove the user space workaround. And RADEON_INFO_GPU_RESET_COUNTER was stashed to be merged in 4.2 as new feature. Annoying but harmless and Stephen's

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/radeon/radeon_kms.c include/uapi/drm/radeon_drm.h between commit: 3bc980bf19bb ("drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query") from Linus' tree and commit: 72b9076b2887 ("drm/radeon: add a GPU

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/radeon/radeon_kms.c include/uapi/drm/radeon_drm.h between commit: 3bc980bf19bb (drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query) from Linus' tree and commit: 72b9076b2887 (drm/radeon: add a GPU

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/drm_irq.c between commit fdb68e09bbb1 ("drm: Zero out invalid vblank timestamp in drm_update_vblank_count") from Linus' tree and commit d66a1e38280c ("drm: Zero out invalid vblank timestamp in

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/drm_irq.c between commit fdb68e09bbb1 (drm: Zero out invalid vblank timestamp in drm_update_vblank_count) from Linus' tree and commit d66a1e38280c (drm: Zero out invalid vblank timestamp in

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/i915/intel_sprite.c between commit 840a1cf0cd53 ("drm/i915: Reject the colorkey ioctls for primary and cursor planes") from Linus' tree and commit a8265c59e22a ("drm/i915: Rip out GET_SPRITE_COLORKEY ioctl") from

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/i915/intel_sprite.c between commit 840a1cf0cd53 (drm/i915: Reject the colorkey ioctls for primary and cursor planes) from Linus' tree and commit a8265c59e22a (drm/i915: Rip out GET_SPRITE_COLORKEY ioctl) from the

Re: linux-next: manual merge of the drm tree with Linus' tree

On 01/29/2015 04:17 AM, Stephen Rothwell wrote: Hi Dave, Today's linux-next merge of the drm tree got conflicts in drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits b8cbab042cd6 ("drm/amdkfd: Allow user to limit

Re: linux-next: manual merge of the drm tree with Linus' tree

On 01/29/2015 04:17 AM, Stephen Rothwell wrote: Hi Dave, Today's linux-next merge of the drm tree got conflicts in drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits b8cbab042cd6 (drm/amdkfd: Allow user to limit only

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got conflicts in drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits b8cbab042cd6 ("drm/amdkfd: Allow user to limit only queues per device") and 9fa843e76d90 ("drm/amdkfd:

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got conflicts in drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits b8cbab042cd6 (drm/amdkfd: Allow user to limit only queues per device) and 9fa843e76d90 (drm/amdkfd:

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, On Thu, 22 Jan 2015 02:31:06 + (GMT) Dave Airlie wrote: > > btw I pushed a drm-next with all these fixed in it a little while ago > > we must be racing! Yeah, I tend to collect all the trees first thing in the morning (around 9 - 10 am my time) and then spend the day merging them.

Re: linux-next: manual merge of the drm tree with Linus' tree

> Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in > drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d > ("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and > commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions") > from the

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d ("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions") from the drm tree. I

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/amd/include/kgd_kfd_interface.h between commit b64b8afcca9d ("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and commit 85ea7d07e1ec ("drm/amd: Add SDMA functions to kfd-->kgd interface") from the

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/amd/amdkfd/kfd_priv.h between commit 6ee0ad2a7f27 ("drm/amdkfd: Drop interrupt SW ring buffer") from Linus' tree and commit 36b5c08f099a ("drm/amdkfd: Add gtt sa related data to kfd_dev struct") from the drm tree.

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d (drm/amd: Fixing typos in kfd-kgd interface) from Linus' tree and commit a84a9903b588 (drm/radeon: Implement SDMA interface functions) from the drm tree. I fixed

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/amd/amdkfd/kfd_priv.h between commit 6ee0ad2a7f27 (drm/amdkfd: Drop interrupt SW ring buffer) from Linus' tree and commit 36b5c08f099a (drm/amdkfd: Add gtt sa related data to kfd_dev struct) from the drm tree. I

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/amd/include/kgd_kfd_interface.h between commit b64b8afcca9d (drm/amd: Fixing typos in kfd-kgd interface) from Linus' tree and commit 85ea7d07e1ec (drm/amd: Add SDMA functions to kfd--kgd interface) from the drm

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d (drm/amd: Fixing typos in kfd-kgd interface) from Linus' tree and commit a84a9903b588 (drm/radeon: Implement SDMA interface functions) from the drm tree.

Re: linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, On Thu, 22 Jan 2015 02:31:06 + (GMT) Dave Airlie airl...@linux.ie wrote: btw I pushed a drm-next with all these fixed in it a little while ago we must be racing! Yeah, I tend to collect all the trees first thing in the morning (around 9 - 10 am my time) and then spend the day

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/radeon/radeon_cs.c between commit 86b276385c6a ("drm/radeon: sync all BOs involved in a CS v2") from Linus' tree and commit 975700d2cc84 ("drm/radeon: split semaphore and sync object handling v2") from the drm

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/nouveau/nouveau_drm.c between commit 8b62c8c6df08 ("nouveau: move the hotplug ignore to correct place") from Linus' tree and commit 7bb6d4428d3d ("drm/nouveau: move the (far too many...) different s/r paths to the

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/nouveau/nouveau_drm.c between commit 8b62c8c6df08 (nouveau: move the hotplug ignore to correct place) from Linus' tree and commit 7bb6d4428d3d (drm/nouveau: move the (far too many...) different s/r paths to the

linux-next: manual merge of the drm tree with Linus' tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/radeon/radeon_cs.c between commit 86b276385c6a (drm/radeon: sync all BOs involved in a CS v2) from Linus' tree and commit 975700d2cc84 (drm/radeon: split semaphore and sync object handling v2) from the drm tree.

Re: linux-next: manual merge of the drm tree with Linus' tree

On Mon, Nov 17, 2014 at 02:11:58PM +1100, Stephen Rothwell wrote: > * PGP Signed by an unknown key > > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in > drivers/gpu/drm/tegra/dc.c between commit 8ff64c17f3be ("drm/tegra: dc: > Add missing call to drm_vblank_on()") from

Re: linux-next: manual merge of the drm tree with Linus' tree

On Mon, Nov 17, 2014 at 02:11:58PM +1100, Stephen Rothwell wrote: * PGP Signed by an unknown key Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/tegra/dc.c between commit 8ff64c17f3be (drm/tegra: dc: Add missing call to drm_vblank_on()) from Linus' tree

  1   2   >