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 conflicts in: drivers/gpu/drm/xe/xe_exec_queue.c drivers/gpu/drm/xe/xe_exec_queue_types.h between commit: eaa367a0317e ("drm/xe/uapi: Remove

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/xe/xe_bo.c drivers/gpu/drm/xe/xe_bo.h between commits: a09946a9a903 ("drm/xe/xe_bo_move: Enhance xe_bo_move trace") 8188cae3cc3d ("drm/xe/xe_trace: Add move_lacks_source detail to xe_bo_move trace")

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.c between commit: 9cdef4f72037 ("drm/amd/display: pbn_div need be updated for hotplug event") from Linus' tree and commit: 191dc43935d1 ("drm/dp_mst: Store the MST PBN

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_object.c between commit: 34e5a54327dc ("Revert "drm/amdgpu: remove TOPDOWN flags when allocating VRAM in large bar system"") from Linus' tree and commit: 7f6db89418f9 ("drm/amdgpu:

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/gt/intel_gt.c between commit: 04aa64375f48 ("drm/i915: fix TLB invalidation for Gen12 video and compute engines") from Linus' tree and commit: 46c507f03a46 ("drm/i915/gt: Always use MCR functions

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

Hi DRm people, On Mon, Nov 28, 2022 at 1:02 AM Stephen Rothwell wrote: > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > > between commits: > > 3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery") > b09d6acba1d9

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_job.c between commits: 3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery") b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID") from Linus' tree and commits:

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/rcar-du/Kconfig between commit: a830a1567859 ("drm: rcar-du: Fix Kconfig dependency between RCAR_DU and RCAR_MIPI_DSI") from Linus' tree and commit: 7a043f978ed1 ("drm: rcar-du: Add RZ/G2L DSI driver")

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

Hi Geert, On Mon, Sep 19, 2022 at 09:58:01AM +0200, Geert Uytterhoeven wrote: > Hi Stephen, > > On Mon, Sep 19, 2022 at 3:07 AM Stephen Rothwell > wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > > > drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c > >

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

Hi Stephen, On Mon, Sep 19, 2022 at 3:07 AM Stephen Rothwell wrote: > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c > > between commit: > > 41012d715d5d ("drm/amd/display: Mark dml30's UseMinimumDCFCLK() as

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/dc/dml/dcn30/display_mode_vba_30.c between commit: 41012d715d5d ("drm/amd/display: Mark dml30's UseMinimumDCFCLK() as noinline for stack usage") from Linus' tree and commit: a0f7e7f759cf

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_display.c between commit: e2b993302f40 ("drm/amdgpu: bypass tiling flag check in virtual display case (v2)") from Linus' tree and commit: 2af104290da5 ("drm: introduce

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

Quoting Stephen Rothwell (2021-10-29 03:48:40) > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/i915_trace.h > > between commit: > > 9a4aa3a2f160 ("drm/i915: Revert 'guc_id' from i915_request tracepoint") > > 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 a conflict in: drivers/gpu/drm/i915/i915_trace.h between commit: 9a4aa3a2f160 ("drm/i915: Revert 'guc_id' from i915_request tracepoint") from Linus' tree and commit: 3cb3e3434b9f ("drm/i915/guc: Move fields protected by

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/include/dal_asic_id.h between commit: 7ab0965079bb ("drm/amd/display: USB4 bring up set correct address") from Linus' tree and commit: 13900e6fde3f ("drm/amd/display: Fix for null pointer

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

Hi all, [Thanks Guenter for pointing this out] On Mon, 23 Aug 2021 12:41:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > between commit: > > 71ac6f390f6a ("drm/mediatek: Add AAL output

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/mediatek/mtk_drm_ddp_comp.c between commit: 71ac6f390f6a ("drm/mediatek: Add AAL output size configuration") from Linus' tree and commit: 78d1783c3243 ("drm/mediatek: Separate aal sub driver") from the

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_globals.c between commits: 1354d830cb8f ("drm/i915: Call i915_globals_exit() if pci_register_device() fails") a07296453bf2 ("drm/i915: fix i915_globals_exit() section mismatch error") 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/amdgpu/amdgpu_ttm.c between commit: da68547d3692 ("drm/amdgpu: use vma_lookup() in amdgpu_ttm_tt_get_user_pages()") from Linus' tree and commit: 04d8d73dbcbe ("drm/amdgpu: add common HMM get pages

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:

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.c between commit: eb916a5a93a6 ("drm/amd/display: Fix pageflip event race condition for DCN.") from Linus' tree and commit: 7f2be468a855 ("drm/amdgpu: Stop using the

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_drv.h drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/i915/intel_pm.h between commit: 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA") from Linus' tree and commits: c113236718e8

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_reg.h between commit: 1d85a299c4db ("drm/i915: Lower RM timeout to avoid DSI hard hangs") from Linus' tree and commit: 41286861b4c9 ("drm/i915/tgl: Add DC3CO counter in i915_dmc_info") 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/i915_drv.c between commits: 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA") 2f216a850715 ("drm/i915: update rawclk also on resume") from Linus' tree and commits: 5bcd53aa39f3

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/gt/intel_gt_pm.c between commit: 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA") from Linus' tree and commit: 3e7abf814193 ("drm/i915: Extract GT render power state management") 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/gt/intel_engine_types.h between commit: 311a50e76a33 ("drm/i915: Add support for mandatory cmdparsing") from Linus' tree and commits: cdb736fa8b8b ("drm/i915: Use engine relative LRIs on context

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/gem/i915_gem_context.c between commit: f8c08d8faee5 ("drm/i915/cmdparser: Add support for backward jumps") from Linus' tree and commit: a4e7ccdac38e ("drm/i915: Move context management under GEM")

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/mediatek/mtk_drm_drv.c between commit: 7837951a12fd ("drm/mediatek: include dma-mapping header") from Linus' tree and commit: 9aef5867c86c ("drm/mediatek: drop use of drmP.h") from the drm tree. I

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/cirrus/cirrus_drv.h include/drm/gma_drm.h between commits: a61127c21302 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 335") c51669eafb45 ("treewide: Replace GPLv2

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.c between commit: a9e8d27574f2 ("drm/amd/display: Make atomic-check validate underscan changes") from Linus' tree and commit: dm_update_crtcs_state ("drm/amd/display:

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

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 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

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/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