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

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpYZZTKt7FPq.pgp Description: OpenPGP digital signature

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

hen 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 pgp6cGcJ1wa21.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-misc tree

Hi Luben, On Mon, 13 Nov 2023 20:32:40 -0500 Luben Tuikov wrote: > > On 2023-11-13 20:08, Luben Tuikov wrote: > > On 2023-11-13 15:55, Stephen Rothwell wrote: > >> Hi all, > >> > >> Commit > >> > >> 0da611a87021 ("dma-buf: add dma

Re: [Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-misc tree

, Stephen Rothwell pgpiyOLMv2tOn.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build warning after merge of the drm-intel tree

splay/drm_dp_mst_topology.c:5488: WARNING: Block quote ends without a blank line; unexpected unindent. Introduced by commit 1cd0a5ea4279 ("drm/dp_mst: Factor out a helper to check the atomic state of a topology manager") -- Cheers, Stephen Rothwell pgpi3SqGfoAKX.pgp Description:

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

ivial 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. -- Cheers, Stephen Rothwell diff --cc dr

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

nflicts 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. -- Cheers, Stephen Rothwell diff --cc drivers/accel/ivp

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

hen 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 pgpYKxsqmW5zI.pgp Description: OpenPGP digital signature

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

Hi all, On Wed, 22 Nov 2023 11:51:37 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > > between commit: > > 9031e0013f81 ("drm/amd/d

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

Hi all, On Mon, 20 Nov 2023 12:28:18 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > > between commits: > > a58555359a9f ("drm/amd/disp

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

ency before managing device link") I have used the drm-misc-fixes tree from next-20231124 for today. -- Cheers, Stephen Rothwell pgpBPp3fHETtg.pgp Description: OpenPGP digital signature

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

ve used the drm-misc tree from next-20231124 for today. -- Cheers, Stephen Rothwell pgptYMmYNM7d1.pgp Description: OpenPGP digital signature

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

meter or member 'pixel_source_property' not described in 'drm_plane' Introduced by commits e50e5fed41c7 ("drm: Introduce pixel_source DRM plane property") 85863a4e16e7 ("drm: Introduce solid fill DRM plane property") -- Cheers, Stephen Rothwell p

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

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.c index 7d2b8ce48fda,93f9985ef75c.. ---

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

Hi all, On Tue, 14 Nov 2023 10:53:30 +0200 Jani Nikula wrote: > > On Tue, 14 Nov 2023, Jani Nikula wrote: > > On Tue, 14 Nov 2023, Stephen Rothwell wrote: > >> > >> After merging the drm-intel tree, today's linux-next build (htmldocs) > >> produc

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

ooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/drm_edid.h index 1ed61e2b30a4,28dd80343afa.. --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@@ -92,15 -92,13 +92,18 @

[Intel-gfx] linux-next: build warning after merge of the drm-intel tree

ommit 41f425adbce9 ("drm/i915/gt: Manage uncore->lock while waiting on MCR register") -- Cheers, Stephen Rothwell pgpgvA1nz1zwl.pgp Description: OpenPGP digital signature

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/dma-buf/dma-buf.c index b6c36914e7c6,eb6b59363c4f.. --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@@ -658

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

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/i915_driver.c index c459eb362c47,e7b2ebc6b88d.. --- a/drivers/gpu/drm/i915/i915_drive

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

d the drm-misc tree from next-20221020 for today. -- Cheers, Stephen Rothwell pgp2BrAsd5Mir.pgp Description: OpenPGP digital signature

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

y 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. -- Cheers, Stephen Rothwell pgpL_nD1Su0lL.pgp Description: OpenPGP digital signature

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

ependency' Introduced by commit c087bbb6d84e ("drm/sched: Create wrapper to add a syncobj dependency to job") -- Cheers, Stephen Rothwell pgpbkt0BxMKAA.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-msm tree with the drm-misc 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 pgpRvvHeGF5H5.pgp Description: OpenPGP digital signature

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

aad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"") from Linus' tree. I can't see any obvious way to fix this up, so I have used teh drm-misc tree from next-20230331 for today. -- Cheers, Stephen Rothwell pgpCN28W1yefr.pgp Description: OpenPGP digital signature

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

ot;) > * bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr") OK, I have done that from today. -- Cheers, Stephen Rothwell pgpSlWdMMikT4.pgp Description: OpenPGP digital signature

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

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/gpu_scheduler.h index ca11716d084a,e40baefadc3a.. --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_sched

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

uot;drm/fb-helper: Set flag in struct drm_fb_helper for leaking physical addresses") -- Cheers, Stephen Rothwell pgpQh_oWpDCBg.pgp Description: OpenPGP digital signature

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

ing tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpeCA3ValoKE.pgp Description: OpenPGP digital signature

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

racting with commit 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers") from the drm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Thu, 10 Nov 2022 11:05:52 +1100 Subject: [PATCH] drm-misc: fix up for "drm/fb-helper: Move

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

ner 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_backlight.c index beba39a38c87,0438071f58cf.

[Intel-gfx] 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/amd/amdgpu/amdgpu_cs.c index de5cb056c9ad,0528c2b1db6e.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

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

hould 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c index d7fc

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

y 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/gpu_scheduler.h index cec147f7c50b,0168ff469ae0.. --- a/include/drm/gpu_scheduler.h +++ b/include/drm

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

Hi all, On Wed, 16 Nov 2022 10:47:52 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > > between commit: > > eca13f3c67b6 ("drm/amdgpu: use the last IB as

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

-misc tree from next-20221115 for today. -- Cheers, Stephen Rothwell pgpysbHsfqCz6.pgp Description: OpenPGP digital signature

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

for today. From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 17 Nov 2022 18:19:22 +1100 Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter" Signed-off-by: Stephen Rothwell --- include/linux/fb.h

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

> > Obviously, the assignment of vc4_hdmi should be before mutex_lock(). Thanks for pointing that out (silly me :-) ). I have fixed up the resolution for today. -- Cheers, Stephen Rothwell pgpcqRpmGR2ff.pgp Description: OpenPGP digital signature

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

e conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index abb99cff8b4b,032651a655f0.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@@ -2

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

Hi all, On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: > > ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled': > fbm

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

e build failure. -- Cheers, Stephen Rothwell pgpak_1Q96ZCI.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: duplicate patches in the drm-intel tree

c5717 ("drm/i915/dsi: fix MIPI_BKLT_EN_1 native GPIO index") -- Cheers, Stephen Rothwell pgpfeHjYXNdZF.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: duplicate patches in the drm tree

drm-misc-fixes tree. -- Cheers, Stephen Rothwell pgp80tBgiJKnS.pgp Description: OpenPGP digital signature

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

/intel_dsb.c:201: warning: Function parameter or member 'dsb' not described in 'intel_dsb_reg_write' Introduced by commit b358c3b98813 ("drm/i915: Make DSB lower level") -- Cheers, Stephen Rothwell pgp8PMBxu9SG9.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: duplicate patches in the drm-misc tree

8 ("Revert "drm/fb-helper: Schedule deferred-I/O worker after writing to framebuffer"") e3ddd2d25533 ("Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper"") -- Cheers, Stephen Rothwell pgp8Gg5LaYB2y.pgp Description: OpenPGP digital signature

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

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/tests/drm_format_helper_test.c index 567c71f95edc,f71dc0fe08a1.. --- a/drivers/gpu/drm/tests/drm_format_helper

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

] 398 | int ret; | ^~~ Caused by commit 07a2975c65f2 ("drm/vc4: bo: Fix drmm_mutex_init memory hog") I have used the drm-misc-fixes tree from next-20230112 for today. -- Cheers, Stephen Rothwell pgpm5mUQ2c9YI.pgp Description: OpenPGP digital signature

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

ng. 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/display/amdgpu_dm/amdgpu_dm.c index 55a845eb0c6d,7bf21bb52a7d.. --- a/drivers/gpu/drm/amd/disp

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

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

[Intel-gfx] linux-next: duplicate patch in the kspp tree

length array of trailing structs with flex-array") in the drm-misc tree. -- Cheers, Stephen Rothwell pgpazNsBngQ0D.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: duplicate patch in the kspp tree

Hi Karol, On Tue, 17 Jan 2023 14:52:12 +0100 Karol Herbst wrote: > > On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell > wrote: > > > > The following commit is also in the drm-misc tree as a different commit > > (but the same patch): > > > > 06b19f4645

[Intel-gfx] linux-next: duplicate patch in the drm-intel tree

el-fixes tree. -- Cheers, Stephen Rothwell pgpTKePF2RJ4i.pgp Description: OpenPGP digital signature

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

o 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/vmwgfx/ttm_object.h index 8098a3846bae,95a9679f9d39.. --- a/drivers/gpu/drm/vmwgfx/ttm_object.h +++ b/drive

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

per") interacting with commit d1d5101452ab ("drm/fb-helper: Set framebuffer for vga-switcheroo clients") from the drm-misc-fixes tree. I have added the following merge fix patch. From: Stephen Rothwell Date: Thu, 19 Jan 2023 12:42:56 +1100 Subject: [PATCH] fix up for "drm

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

ream 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/accel/Kconfig index 4989376e5938,a5989b55178a.. --

[Intel-gfx] linux-next: duplicate patch in the drm-intel tree

Hi all, The following commit is also in Linus Torvalds' tree as a different commit (but the same patch): 0fe76b198d48 ("drm/i915/display: Check source height is > 0") -- Cheers, Stephen Rothwell pgpmxl95vdtuQ.pgp Description: OpenPGP digital signature

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

ng. 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/i915_drv.h index 48fd82722f12,ac4c3c6f5541.. --- a/drivers/gpu/drm/i915/i915_drv.h +

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

d, 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. -- Cheers, Stephen Rothwell diff --cc

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

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 pgpndQPlVuwHy.pgp Description: OpenPGP digital signature

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

Hi all, On Tue, 31 Jan 2023 10:27:29 -0800 John Harrison wrote: > > On 1/31/2023 04:44, Andy Shevchenko wrote: > > On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: > >> > >> Today's linux-next merge of the usb tree got a conflict in: &

Re: Comments in Fixes: line (Was: Re: linux-next: Fixes tag needs some work in the drm-intel tree)

suggested notifications - I don't send them all. -- Cheers, Stephen Rothwell pgpugJvNEWE3W.pgp Description: OpenPGP digital signature

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

Hi all, On Wed, 12 Jun 2024 14:11:10 +1000 Stephen Rothwell wrote: > > After merging the drm-intel tree, today's linux-next build (htmldocs) > produced this warning: > > include/drm/display/drm_dp_helper.h:127: warning: Function parameter or > struct member 'targ

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

Hi all, On Mon, 15 Jul 2024 14:13:37 +0200 Maarten Lankhorst wrote: > > Den 2024-07-15 kl. 06:21, skrev Golani, Mitulkumar Ajitkumar: > > > > On 15-07-2024 04:42, Stephen Rothwell wrote: > >> > >> On Wed, 12 Jun 2024 14:11:10 +1000 Stephen Rothwell > &

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

or 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/ast/ast_drv.h index 47bab5596c16,b54a89676e9f.. --- a/drivers/gpu/drm/ast/ast_drv.h

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

or 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/xe_vm.c index c3bdb6362fe9,f225107bdd65.. --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/d

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

: Document Colorspace property variants") 76299a557f36 ("drm: Introduce 'power saving policy' drm property") -- Cheers, Stephen Rothwell pgpG9LDQ8esbS.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 0e4adde84cb2,56a940b39412.. --- a/drivers/gpu/drm/xe/display/xe_display.c

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

conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 34872eb4fc84,7d999e352df3.. --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_

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

Hi all, On Mon, 26 Aug 2024 11:10:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the amdgpu tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > between commits: > > 537ef0f88897 ("drm/amd/display: use

linux-next: manual merge of the drm tree with the drm-intel-fixes 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_dp_mst.c index

linux-next: manual merge of the drm-misc tree with the pmdomain 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 pgphaJyJouSk1.pgp Description: OpenPGP digital signature

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

reset") from the drm-intel-fixes tree. I have applied the following patch for today. From: Stephen Rothwell Date: Thu, 29 Aug 2024 11:24:26 +1000 Subject: [PATCH] fix up for "drm/i915/dp_mst: Fix MST state after a sink reset" interacting with "Merge branch 'drm-next

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

ner 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/bridge/samsung-dsim.c index 6a10aa5c85f5,f9d85fe1df7e.. -

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

Hi all, On Tue, 6 Feb 2024 11:59:56 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/bridge/samsung-dsim.c > > between commit: > > ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't

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

l GPUs") (and maybe others) from Linus' tree (v6.8-rc1). I have applied the following merge fix patch for today. This makes it build, but more is likely needed ... From: Stephen Rothwell Date: Tue, 6 Feb 2024 12:21:07 +1100 Subject: [PATCH] fix up for "drm/ttm: replace busy pl

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

em_ttm.c:837:26: note: 'places' declared here 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1]; | ^~ Caused by commit a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") I applied the following hack for tod

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

Hi all, On Tue, 6 Feb 2024 12:28:22 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: drivers/gpu/drm/xe/xe_bo.c:41:10: error: 'struct ttm_placement' has no member named 'num_

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

Hi all, On Tue, 6 Feb 2024 15:28:50 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (i386 defconfig) > failed like this: > > In function 'i915_ttm_placement_from_obj', > inlined from 'i915_ttm_get

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

s/drm_mm_test.c:191:32: error: invalid initializer cc1: all warnings being treated as errors Caused by commit e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer") I have used the drm-misc tree from next-20240209 for today. -- Cheers, Stephen Rothwell pgp_BlgWqj6bz.pgp Description: OpenPGP digital signature

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

mmit 5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using drm_err()") I have used the drm-misc tree from next-20240209 again today. -- Cheers, Stephen Rothwell pgpdGRKhpbvw8.pgp Description: OpenPGP digital signature

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

te methods") -- Cheers, Stephen Rothwell pgpSiSHHKSJm5.pgp Description: OpenPGP digital signature

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

Hi all, On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula wrote: > > On Tue, 06 Feb 2024, Stephen Rothwell wrote: > > > > After merging the drm-misc tree, today's linux-next build (i386 defconfig) > > failed like this: > > > > In function 'i915

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

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 pgpfNZXAtObxC.pgp Description: OpenPGP digital signature

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

7;rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *, struct device_node *, unsigned int)' 66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np, | ^~~~~ Caused by commit 768e9e61b3b9 ("drm: rene

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

Hi all, On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell wrote: > > On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula > wrote: > > > > On Tue, 06 Feb 2024, Stephen Rothwell wrote: > > > > > > After merging the drm-misc tree, today's linux-next b

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

Hi all, On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell wrote: > > On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell > wrote: > > > > On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula > > wrote: > > > > > > On Tue, 06 Feb 2024, Steph

linux-next: build failure after merge of the kunit-next tree

by commit 806cb2270237 ("kunit: Annotate _MSG assertion variants with gnu printf specifiers") interacting with commit c70703320e55 ("drm/tests/drm_buddy: add alloc_range_bias test") from the drm-misc-fixes tree. I have applied the following patch for today (this should probably ac

Re: [PATCH] drm/i915: fix applying placement flag

build problem. Tested-by: Stephen Rothwell # compile only -- Cheers, Stephen Rothwell pgpWCPWlgMfWr.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the kunit-next tree

#x27;s the best > way to keep all of the printk formatting fixes together. I am pretty sure that the proper fix has been applied to the drm-fixes tree today (in the merge of the drm-misc-fixes tree). -- Cheers, Stephen Rothwell pgpVXg0c9UyzN.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the kunit-next tree

Hi Shuah, On Fri, 1 Mar 2024 09:05:57 -0700 Shuah Khan wrote: > > On 3/1/24 03:43, Stephen Rothwell wrote: > > Hi all, > > > > On Fri, 1 Mar 2024 15:15:02 +0800 David Gow wrote: > >> > >> On Thu, 29 Feb 2024 at 23:07, Shuah Khan > >&g

linux-next: manual merge of the drm tree with the drm-intel-fixes 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/i915/display/intel_dp.c index 94d2a15d8444,6ece2c563c7a.. --- a/drivers/gpu/dr

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

t 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. -- Cheers, Stephen Rothwell d

Re: FYI: drm-intel repo moved to fd.o GitLab

b.freedesktop.org/drm/i915/kernel I have updated where linux-next fetched from. I used the URL but added ".git" to the end to save an extra round trip delay when the above redirects. -- Cheers, Stephen Rothwell pgpw3SlaklKs2.pgp Description: OpenPGP digital signature

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

Performance Counters descriptions for V3D 4.2 and 7.1") I have used the drm-misc tree from next-20240528 for today. -- Cheers, Stephen Rothwell pgpvoz0I5GVxB.pgp Description: OpenPGP digital signature

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

drm_hdmi_compute_mode_clock cc1: some warnings being treated as errors Caused by commit ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector") I have used the drm-misc tree from next-20240528 for today. -- Cheers, Stephen Rothwell pgp7cArRfjvZS.pgp Description: OpenPGP digital signature

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

20c6d954d75 ("drm/dp: Add refresh rate divider to struct representing AS SDP") -- Cheers, Stephen Rothwell pgpOXMRbUvsV1.pgp Description: OpenPGP digital signature

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

aused by commit 1676ecd303ac ("drm/i915: Compute CMRR and calculate vtotal") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpWknEZB_4cf.pgp Description: OpenPGP digital signature

linux-next: fetch warning for the drm-intel tree

Hi all, fetching the drm-intel tree produced this warning: Commit 326e30e4624c ("drm/i915: Drop dead code for pvc") added this unexpected file: drivers/gpu/drm/i915/gt/intel_workarounds.c.rej -- Cheers, Stephen Rothwell pgppn01U5QIaw.pgp Description: OpenPGP digital signature

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

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 MAINTAINERS index ae2121b7a176,13a69b4731c7.. --- a/MAINTAINERS +++ b/MA

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

bugfs knob with sysfs") Also, that file does not have a newline at the end of its last line. -- Cheers, Stephen Rothwell pgpaPNcJRgQGz.pgp Description: OpenPGP digital signature

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

.h:344: warning: Function parameter or struct member 'pad' not described in 'drm_panthor_gpu_info' Introduced by commit 0f25e493a246 ("drm/panthor: Add uAPI") -- Cheers, Stephen Rothwell pgpesnzBcNq2m.pgp Description: OpenPGP digital signature

<    1   2   3   4   5   6   7   8   >