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

l_check_cursor_plane") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 3117679299a6,2ac93909cfc5..0

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

f pointer in request structure") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_drv.h index 8727086cf48c,239a382c8b55..0

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

can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index ba9321998a41,4bcbff9793d4.. --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_di

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

m/i915/gtt: Use macros to access dma mapped pages") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c index dcc6a88c5

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

quot;drm/i915: add a context parameter to {en, dis}able zero address mapping") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/

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

drm/i915: Remove the now obsolete 'outstanding_lazy_request'") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/in

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

correctly as these conflicts tend to go on and on as the files get changed. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 85ac6d85dc39,00c60c1c5162.. --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

isc tree from next-20150713 for today. (That commit said "COMPILE TESTED ONLY" :-() -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5cB7wGZvSm.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel

[Intel-gfx] linux-next: build warnings after merge of the drm-misc tree

vers/gpu/drm/nouveau/nouveau_fbcon.c: In function 'nouveau_fbcon_create': drivers/gpu/drm/nouveau/nouveau_fbcon.c:322:18: warning: unused variable 'pdev' [-Wunused-variable] struct pci_dev *pdev = dev->pdev; ^ Caused by commit 237fc6452ca5 ("drm/nouveau:

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

ba9e ("drm/i915: get rid of intel_crtc_disable and related code, v3") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i

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

mode_config_reset") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/drm_crtc.c index c91c18b2b1d4,7d02e32b4e94.. --- a/dr

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

4e ("drm/atomic: add connectors_changed to separate it from mode_changed, v2") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu

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

ra tree. I fixed it up (the latter commits removed the code updated by the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lis

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

ency cleanups") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/drm_irq.c index ee14324522ce,70919d48f015.. --- a/d

[Intel-gfx] linux-next: build warnings after merge of the drm-misc tree

;msm_driver.get_vblank_counter') Introduced by commit b90180b057f7 ("drm/irq: More pipe/crtc consistency cleanups") -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedes

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

just used the latter tree versions) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

/i915: Pass intel_crtc to intel_disable_pipe() and intel_wait_for_pipe_off()") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/inte

linux-next: build warning after merge of the drm-misc tree

struct member 'name_lock' description in 'drm_file' Introduced by commit 56c594d8df64 ("drm: add DRM_SET_CLIENT_NAME ioctl") -- Cheers, Stephen Rothwell pgpA8QObjNA3D.pgp Description: OpenPGP digital signature

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

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/xe/display/xe_display.c index 957ae763531d,5c6b74c36b60.. --- a/drivers/gpu/dr

Re: linux-next: manual merge of the drm-xe tree with the drm-misc-fixes tree

Hi all, On Fri, 4 Oct 2024 12:18:00 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/xe_guc_submit.c > > between commit: > > 9286a191abe2 ("drm/xe: Drop GuC submit_wq pool"

Re: linux-next: build warning after merge of the drm-intel tree

Hi all, On Tue, 1 Oct 2024 13:43:31 +1000 Stephen Rothwell wrote: > > After merging the drm-intel tree, today's linux-next build (htmldocs) > produced this warning: > > drivers/gpu/drm/i915/i915_irq.c:1: warning: > 'intel_runtime_pm_disable_interrupts'

linux-next: build warning after merge of the drm-misc tree

probe' not described in 'drm_driver' Introduced by commit 5d08c44e47b9 ("drm/fbdev: Add memory-agnostic fbdev client") -- Cheers, Stephen Rothwell pgpHZRe0nV_gt.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the drm-misc tree

drivers/gpu/drm/drm_fbdev_dma.c Documentation/gpu/drm-kms-helpers.rst -- Cheers, Stephen Rothwell pgpbNGYLFZdad.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the drm-misc tree

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced this warning: drivers/gpu/drm/drm_fbdev_ttm.c:1: warning: no structured comments found Introduced by commit 1000634477d8 ("drm/fbdev-ttm: Remove obsolete setup function") -- Cheers, S

linux-next: build warning after merge of the drm-misc tree

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced this warning: drivers/gpu/drm/drm_fbdev_shmem.c:1: warning: no structured comments found Introduced by commit bf0978203a74 ("drm/fbdev-shmem: Remove obsolete setup function") -- Cheers, S

linux-next: build warning after merge of the drm-misc tree

add sysfs knob for enabling job profiling") -- Cheers, Stephen Rothwell pgpYpBFDDywWl.pgp Description: OpenPGP digital signature

linux-next: build warnings after merge of the drm-misc tree

h:270: warning: Function parameter or struct member 'unevictable' not described in 'ttm_device' Introduced by commit fc5d96670eb2 ("drm/ttm: Move swapped objects off the manager's LRU list") -- Cheers, Stephen Rothwell pgpGsaJHBIlhI.pgp Description: OpenPGP digital signature

linux-next: build warnings after merge of the drm-misc tree

975bdea8c470 ("drm/mipi-dsi: add mipi_dsi_compression_mode_multi") -- Cheers, Stephen Rothwell pgpvEBFS4ULkb.pgp Description: OpenPGP digital signature

linux-next: manual merge of the drm-xe tree with the drm-misc-fixes tree

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/xe/xe_guc_submit.c index 17c25f18e286,8a5c21a87977.. --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_sub

Re: linux-next: build warning after merge of the drm-misc tree

Hi all, On Fri, 8 Nov 2024 17:56:55 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > Documentation/gpu/drm-mm:571: drivers/gpu/drm/scheduler/sched_main.c:1359: > ERROR: Unexpected inden

linux-next: build failure after merge of the drm-xe tree

mmit 501d799a47e2 ("drm/xe: Wire up device shutdown handler") interacting with commit 5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display") from the drm-intel tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Tue, 1 Oct

linux-next: build warning after merge of the drm-intel tree

nterrupts' not found Introduced by commit 3de5774cb8c0 ("drm/i915/irq: Rename suspend/resume functions") -- Cheers, Stephen Rothwell pgpq7woUcxiuV.pgp Description: OpenPGP digital signature

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

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/panthor/panthor_drv.c index c520f156e2d7,f9b93f84d611.. --- a/drivers/gpu/drm/panthor/panthor_drv.c +++

linux-next: build warning after merge of the drm-misc tree

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced this warning: Documentation/gpu/panthor.rst: WARNING: document isn't included in any toctree Introduced by commit 6a797bdfde77 ("drm/panthor: add sysfs knob for enabling job profiling")

linux-next: build warning after merge of the drm-misc tree

e teardown documentation") -- Cheers, Stephen Rothwell pgpfssLvNsW1O.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the drm-misc tree

tring literal") from Linus' tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Mon, 9 Dec 2024 12:08:24 +1100 Subject: [PATCH] fix up for "drm/virtio: Add a helper to map and note the dma addrs and lengths" interacting with commit

linux-next: build warnings after merge of the drm-misc tree

ing: Excess struct member 'prepare' description in 'drm_bridge_funcs' Introduced by commit 0beba3f9d366 ("drm/bridge: connector: add support for HDMI codec framework") -- Cheers, Stephen Rothwell pgpq7AgvY7J9X.pgp Description: OpenPGP digital signature

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

entioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/display/intel_display_dr

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

Hi All, On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_display_driver.c > > between commit: > > 4fc0cee83590 ("drivers: remove g

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

upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c index aecaaf1d0fe2,2

linux-next: build warning after merge of the drm-misc tree

stead Introduced by commit 135d8fc7af44 ("drm: writeback: Create an helper for drm_writeback_connector initialization") -- Cheers, Stephen Rothwell pgpUb5Mg_pHZk.pgp Description: OpenPGP digital signature

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

m maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/xe/display/xe_display.c index b5502f335f53,b8bfb666ebe8..

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

mitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c index 56ca571e534c,326ff20a5a49.. --- a/drivers

linux-next: build warnings after merge of the drm-misc tree

1: warning: no structured comments found Introduced by commit 3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support") -- Cheers, Stephen Rothwell pgp5hbROPGmTt.pgp Description: OpenPGP digital signature

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

Hi all, On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell wrote: > > On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > > drivers/gpu/drm/i915/display/intel_di

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

en your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/display/drm_bridge_connector.c index 3a5a4f92c979,32108307de66..0

Re: linux-next: build warnings after merge of the drm-misc tree

Hi all, On Fri, 20 Dec 2024 15:42:08 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced these warnings: > > drivers/gpu/drm/xlnx/zynqmp_dpsub.h:86: warning: Function parameter or struct > member &

Re: linux-next: build warnings after merge of the drm-misc tree

Hi all, On Mon, 6 Jan 2025 17:46:45 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced these warnings: > > include/drm/drm_bridge.h:738: warning: Function parameter or struct member > 'hdmi_aud

Re: linux-next: build warnings after merge of the drm-misc tree

Hi Dmitry, On Tue, 14 Jan 2025 13:40:43 +0200 Dmitry Baryshkov wrote: > > The patch is pending reviewal: > > https://lore.kernel.org/dri-devel/20250107-drm-bridge-fix-docs-v1-1-84e539e6f...@linaro.org/ Thanks -- Cheers, Stephen Rothwell pgpuBTAJBj2ct.pgp Description: Ope

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/xe/display/xe_display.c index 96ba9595bf2a,ac0804726e55.. --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/d

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

bmitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/drm_kunit_helpers.h index 1c62d1d4458c,1cda7281f300.. --- a/include/drm/

linux-next: build warnings after merge of the drm-intel tree

splay/intel_hotplug.c:1069: WARNING: Block quote ends without a blank line; unexpected unindent. [docutils] Introduced by commit 0d77a3e0ea90 ("drm/i915/hpd: Add support for blocking the IRQ handling on an HPD pin") -- Cheers, Stephen Rothwell pgpN2Yo0WgI1u.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the drm-misc tree

aused by commit 325ba852d148 ("drm/i2c: move TDA998x driver under drivers/gpu/drm/bridge") I have used the drm-misc tree from next-20250212 for today. -- Cheers, Stephen Rothwell pgpHLIMpt0VEJ.pgp Description: OpenPGP digital signature

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

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/xe/display/xe_display.c index 96ba9595bf2a,279b786d64dc.. --- a/drivers/gpu/drm/xe/display/xe_display.c

linux-next: build failure after merge of the drm-misc tree

ext-20250527 for today. -- Cheers, Stephen Rothwell pgpSO52wl5pRX.pgp Description: OpenPGP digital signature

linux-next: build warnings after merge of the drm-misc tree

arameter or struct member 'comm' not described in 'drm_wedge_task_info' Introduced by commit 183bccafa176 ("drm: Create a task info option for wedge events") -- Cheers, Stephen Rothwell pgpvGfnXSjEav.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the drm-misc tree

bout "Task information" for the wedge API") -- Cheers, Stephen Rothwell pgpkJGfw3sd4N.pgp Description: OpenPGP digital signature

linux-next: semantic conflict between the drm-misc tree and Linus' tree

#x27; tree (in v6.16-rc1). As a fix up patch would be a bit of a mess, I have used the drm-misc tree from next-20250606 for today. -- Cheers, Stephen Rothwell pgpKRGEGgYJ9y.pgp Description: OpenPGP digital signature

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

is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/accel/ivpu/ivpu_gem.c index e0d242d9f3e5,248bfebeaa22.. --- a/drivers/accel

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

Hi all, On Wed, 11 Jun 2025 12:08:01 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/vc4/vc4_hdmi.c > > between commit: > > c0317ad44f45 ("drm/vc4: fix infinite EPROBE_DEFER loop&q

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

en your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpdQcYADCk2N.pgp Description: OpenPGP digital signature

linux-next: build warnings after merge of the drm-misc tree

ing: Function parameter or struct member 'hdmi_cec_transmit' not described in 'drm_bridge_funcs' Introduced by commit a74288c8ded7 ("drm/display: bridge-connector: handle CEC adapters") -- Cheers, Stephen Rothwell pgpH53wb_iCmy.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the drm-misc tree

e ("drm/bridge: Pass down connector to drm bridge detect hook") -- Cheers, Stephen Rothwell pgpfc9cE0oP8G.pgp Description: OpenPGP digital signature

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

as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Chee

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

en your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/display/drm_dp_helper.c index ea78c6c8ca7a,1c3920297906..0

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

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc rust/kernel/drm/gem/mod.rs index a24c9a2fc201,6f914ae0a5aa.. --- a/rust/kernel/drm/gem/mod.rs +++ b/rust/kernel/drm/gem/mod.rs @@@ -124,12

linux-next: build failure after merge of the drm-misc tree

mit 5d156a9c3d5e ("drm/bridge: Pass down connector to drm bridge detect hook") I have used the drm-misc tree from next-20250714 for today. -- Cheers, Stephen Rothwell pgp81lk6N3aEq.pgp Description: OpenPGP digital signature

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

Hi all, On Tue, 1 Jul 2025 12:54:43 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c > > between commit: > > ebe43542702c ("drm/amdgpu: switch job hw_fence

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

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpqj2cmQYr6k.pgp Description: OpenPGP digital signature

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

er of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 6b4ffa9ceb7a,f0b7080dccb8.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@@ -89,11 -

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

Hi all, Sorry, this was actually a conflict between the amdgpu tree and the drm tree. On Tue, 1 Jul 2025 13:07:02 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c >

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

Hi all, Sorry, this was actually a conflict between the amdgpu tree and Linus' tree. On Tue, 1 Jul 2025 12:57:05 +1000 Stephen Rothwell wrote: > > On Tue, 1 Jul 2025 12:54:43 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the

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

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index ec73cf3a9024,5cb7bf9420f7.. --- a/drivers/gpu/dr

linux-next: build warning after merge of the drm-misc tree

2af612ad4290 ("drm/dp: Introduce new member in drm_backlight_info") -- Cheers, Stephen Rothwell pgpL9dB2hAjmp.pgp Description: OpenPGP digital signature

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

ntioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgp8DKVA3RpaH.pgp Description: OpenPGP digital signature

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

Hi all, On Wed, 16 Jul 2025 14:23:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/etnaviv/etnaviv_sched.c > > between commit: > > 61ee19dedb8d ("drm/etnaviv: Protect the schedul

Re: linux-next: build warning after merge of the drm-misc tree

Hi all, On Wed, 16 Jul 2025 20:31:15 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > drivers/gpu/drm/drm_bridge.c:1242: warning: Function parameter or struct > member '

Re: linux-next: build warnings after merge of the drm-misc tree

Hi all, On Wed, 11 Jun 2025 14:09:33 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced these warnings: > > include/drm/drm_bridge.h:943: warning: Function parameter or struct member > 'hdm

<    3   4   5   6   7   8