Hi all,
On Mon, 28 Apr 2025 13:30:13 +1000 Stephen Rothwell
wrote:
>
> After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/gpu/drm/xe/xe_bo.c:3118:
> drivers/gpu/drm/xe/tests/xe_bo.c: In fun
p unused force_alloc flag")
I have used the drm tree from next-20250424 for today.
--
Cheers,
Stephen Rothwell
pgpPudcrC49e1.pgp
Description: OpenPGP digital signature
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/
ot;)
>
> Signed-off-by: Alessandro Carminati
Please keep all the commit message tags together at the end of the
commit message.
--
Cheers,
Stephen Rothwell
pgpAU4vPYkO2_.pgp
Description: OpenPGP digital signature
Hi all,
On Thu, 13 Mar 2025 14:12:53 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_pmu.c
>
> between commit:
>
> 87b593d79864 ("drm/i915/pmu: Drop custom hotplug code&q
ing
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/xe/xe_bo.h
index 43bf6f140d40,bda3fdd408da..
--- a/drivers/gpu/drm/xe/xe_bo.h
+++ b/drivers/gpu/drm/xe/xe_bo.h
@@@ -341,6 -391,21 +391,20
elf::IdInfo) ->
> Result>> {
> dev_dbg!(pdev.as_ref(), "Probe Nova Core GPU driver.\n");
>
> pdev.enable_device_mem()?;
>
I have added that to the merge resolution for the merge of the
driver-core tree today and it works for me. Thanks.
--
Cheers,
Stephen Rothwell
pgpG8XLxGFQOu.pgp
Description: OpenPGP digital signature
53, E0599.
For more information about an error, try `rustc --explain E0053`.
Presumably caused by commit
7b948a2af6b5 ("rust: pci: fix unrestricted &mut pci::Device")
interacting with commit
54e6baf123fd ("gpu: nova-core: add initial driver stub")
from the drm tree.
I
ng
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_pmu.c
index 69a109d02116,0ce87f188d11..
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@@ -1155,8
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
pgp_GhD6IAkIi.pgp
Description: OpenPGP digital signature
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/drm_panic_qr.rs
index 5d21f6d10bcb,ecd87e8ffe05..
--- a/drivers/gpu/drm/drm_panic_qr.rs
+++ b/drivers/gpu/drm/drm_panic_qr
fidence in the
resulting linux-next tree (and so can I :-)) and when the merge
requests are sent to Linus, they can just reference my resolution.
--
Cheers,
Stephen Rothwell
pgpq7h94XMjXm.pgp
Description: OpenPGP digital signature
Hi all,
On Fri, 7 Mar 2025 12:58:03 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-xe tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/drm_gpusvm.c: In function 'drm_gpusvm_range_get_pages':
> drivers/gp
Hi Stephen,
On Fri, 7 Mar 2025 13:21:12 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> After merging the drm-xe tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from include/linux/kernel.h:22,
> fr
Hi all,
On Fri, 7 Mar 2025 12:29:54 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm-xe tree got a conflict in:
>
> mm/memory.c
>
> between commit:
>
> 089b22f60a0f ("mm: allow compound zone device pages")
&g
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
pgpb6aGreDUwM.pgp
Description: OpenPGP digital signature
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 02a413a07382,279b786d64dc..
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/d
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
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/amd/display/amdgpu_dm/amdgpu_d
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
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
pgpNIYmmka5as.pgp
Description: OpenPGP digital signature
af44 ("drm: writeback: Create an helper for
> drm_writeback_connector initialization")
> Reported-by: Stephen Rothwell
> Closes: https://lore.kernel.org/all/20250207142201.550ce...@canb.auug.org.au/
> Signed-off-by: Louis Chauvet
> ---
> Hi,
>
> I don't kno
stead
Introduced by commit
135d8fc7af44 ("drm: writeback: Create an helper for drm_writeback_connector
initialization")
--
Cheers,
Stephen Rothwell
pgphpH8TirSP7.pgp
Description: OpenPGP digital signature
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
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
Hi all,
On Mon, 13 Jan 2025 15:54:23 +1100 Stephen Rothwell
wrote:
>
> After merging the amdgpu tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/amd/include/amd_shared.h:352: warning: Enum value
> 'DC_DISABLE_HDMI_CEC' not
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
pgpsUaoJiAesr.pgp
Description: Ope
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
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 &
bb1d67bf82fb ("ASoC: hdmi-codec: move no_capture_mute to struct
hdmi_codec_pdata")
6af45d7df109 ("ASoC: hdmi-codec: pass data to get_dai_id too")
in the drm tree.
The latter of these is already causing an unnecessary conflict in
drivers/gpu/drm/bridge/lontium
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
27;dev' description
in 'dmem_cgroup_try_charge'
Introduced by commit
b168ed458dde ("kernel/cgroup: Add "dmem" memory accounting cgroup")
--
Cheers,
Stephen Rothwell
pgpY95H4m7StE.pgp
Description: OpenPGP digital signature
Hi all,
After merging the drm tree, today's linux-next build (htmldocs) produced
this warning:
Documentation/gpu/drm-compute.rst: WARNING: document isn't included in any
toctree
Introduced by commit
b168ed458dde ("kernel/cgroup: Add "dmem" memory accounting cgro
Add "dmem" memory accounting cgroup")
--
Cheers,
Stephen Rothwell
pgpaa3DQWQ6x6.pgp
Description: OpenPGP digital signature
Hi all,
On Mon, 16 Dec 2024 18:38:01 +1100 Stephen Rothwell
wrote:
>
> On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm-xe tree got a conflict in:
> >
> > include/drm/intel/xe_pciids.h
> >
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
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
pgpcQtDB7jsLi.pgp
Description: OpenPGP digital signature
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
1: warning: no structured comments found
Introduced by commit
3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support")
--
Cheers,
Stephen Rothwell
pgpEFaByZ4BPd.pgp
Description: OpenPGP digital signature
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
Hi all,
On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-xe tree got a conflict in:
>
> include/drm/intel/xe_pciids.h
>
> between commit:
>
> 493454445c95 ("drm/xe: switch to common PCI ID macros&
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..
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
Hi all,
On Thu, 10 Oct 2024 15:38:55 +1100 Stephen Rothwell
wrote:
>
> On Tue, 1 Oct 2024 13:44:23 +1000 Stephen Rothwell
> wrote:
> >
> > After merging the random tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> >
.588ec...@canb.auug.org.au/
--
Cheers,
Stephen Rothwell
pgp81r0ZaDVrJ.pgp
Description: OpenPGP digital signature
*/
> +#define SHARPSL_BATCHK_TIME(secs_to_jiffies(15))/*
> 15 sec */
It might be nice to keep the alignment of the comments here.
--
Cheers,
Stephen Rothwell
pgp0P6_6UuQ0z.pgp
Description: OpenPGP digital signature
] = secs_to_jiffies(3),
You have changed this last timeout from 30 seconds to 3 (presumably
just a copy and paste error).
--
Cheers,
Stephen Rothwell
pgpOo1EoVpC8f.pgp
Description: OpenPGP digital signature
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
t 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_gt_ccs_mode.c
index ffcbd05671fc,9360ac4de489..
--- a/drivers/gpu/drm/xe/xe_gt_ccs_mode.c
+++ b/drive
e teardown documentation")
--
Cheers,
Stephen Rothwell
pgpxdkvVTVu7u.pgp
Description: OpenPGP digital signature
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 ea2663169bf3,cbae2fc7b94e..
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/d
facc09 ("drm/nouveau/tegra: Use iommu_paging_domain_alloc()")
in the drm tree and
93ee2d7ce266 ("media: nvidia: tegra: Use iommu_paging_domain_alloc()")
in the v4l-dvb tree.
--
Cheers,
Stephen Rothwell
pgpmCrWr1WpBg.pgp
Description: OpenPGP digital signature
as necessary. This is now
fixed as far 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 partic
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/qxl/Kconfig
index 17d6927e5e23,1992df4a82d2..
--- a/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
# SPD
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/tiny/bochs.c
index e738bb858316,447989bb8201..
--- a/drivers/gpu/drm/tiny/bochs.c
+++ b/drivers/gpu/drm/tiny/bochs.c
@@@ -1,6 -1,6 +1,7 @@@
/
ng
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/gma500/Kconfig
index 23b7c14de5e2,c2927c37c40b..
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@@ -1,7 -1,8
our 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 eeaedd979354,4765bda154c1..
-
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
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'
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
pgpyQIcvfJBIm.pgp
Description: OpenPGP digital signature
975bdea8c470 ("drm/mipi-dsi: add mipi_dsi_compression_mode_multi")
--
Cheers,
Stephen Rothwell
pgpFyN7mB5Oc1.pgp
Description: OpenPGP digital signature
struct member 'name_lock'
description in 'drm_file'
Introduced by commit
56c594d8df64 ("drm: add DRM_SET_CLIENT_NAME ioctl")
--
Cheers,
Stephen Rothwell
pgp8bysJ5xHZC.pgp
Description: OpenPGP digital signature
add sysfs knob for enabling job profiling")
--
Cheers,
Stephen Rothwell
pgpUL9YsoFs6o.pgp
Description: OpenPGP digital signature
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"
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
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")
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
+++
probe' not described in 'drm_driver'
Introduced by commit
5d08c44e47b9 ("drm/fbdev: Add memory-agnostic fbdev client")
--
Cheers,
Stephen Rothwell
pgpQfqbzgA3Ct.pgp
Description: OpenPGP digital signature
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
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
drivers/gpu/drm/drm_fbdev_dma.c
Documentation/gpu/drm-kms-helpers.rst
--
Cheers,
Stephen Rothwell
pgpIFWt099Z2f.pgp
Description: OpenPGP digital signature
nterrupts' not found
Introduced by commit
3de5774cb8c0 ("drm/i915/irq: Rename suspend/resume functions")
--
Cheers,
Stephen Rothwell
pgp5ikPoZW0_q.pgp
Description: OpenPGP digital signature
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
Hi all,
On Mon, 9 Sep 2024 19:59:39 +1000 Stephen Rothwell
wrote:
>
> After merging the kspp tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down'
>56 | stat
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/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
index d5e9aec52
Hi all,
On Wed, 4 Sep 2024 16:30:18 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc-fixes tree, today's linux-next build (htmldocs)
> produced this warning:
>
> Error: Cannot open file drivers/gpu/drm/drm_bridge_connector.c
>
> Introduced by commit
Hi all,
On Fri, 6 Sep 2024 13:15:02 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-xe tree got a conflict in:
>
> drivers/gpu/drm/xe/display/xe_display.c
>
> between commit:
>
> 11d0613af7c5 ("drm/i915/display: include drm/
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 c860fda410c8,710b1e2170c1..
--- a/drivers/gpu/drm/xe/display/xe_disp
Hi all,
On Mon, 26 Aug 2024 15:59:16 +1000 Stephen Rothwell
wrote:
>
> After merging the amdgpu tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2785: warning: Function parameter or
> struct membe
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 303d00b99a68,75736faf2a80..
--- a/drivers/gpu/drm/xe/display/xe_display.c
Hi all,
After merging the drm-misc-fixes tree, today's linux-next build (htmldocs)
produced this warning:
Error: Cannot open file drivers/gpu/drm/drm_bridge_connector.c
Introduced by commit
9da7ec9b19d8 ("drm/bridge-connector: move to DRM_DISPLAY_HELPER module")
--
Cheers,
S
^
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is
reported only once for each function it appears in
Caused by commit
a15710027afb ("drm/bridge: add support for TI TDP158")
I have used the drm-misc t
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
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
pgpzDgPTSLwOb.pgp
Description: OpenPGP digital signature
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
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
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/pstore/platform.c
index 84719e2bcbc4,9c6b7c97fa3c..
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@@ -285,10 -285,10 +285,10 @@@ stati
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_
("drm/amdgpu: add per ring reset support (v5)")
interacting with commit
83b501c1799a ("drm/scheduler: remove full_recover from drm_sched_start")
from the drm tree.
I have applied the following merge fix patch.
From: Stephen Rothwell
Date: Mon, 19 Aug 2024 11:46:24 +1000
Subjec
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
: Document Colorspace property variants")
76299a557f36 ("drm: Introduce 'power saving policy' drm property")
--
Cheers,
Stephen Rothwell
pgp01cgicrMXk.pgp
Description: OpenPGP digital signature
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
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
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
> &
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
Hi all,
On Fri, 31 May 2024 15:26:36 +1000 Stephen Rothwell
wrote:
>
> After merging the amdgpu tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h:586: warning: Function
> parameter or struct me
Hi all,
On Tue, 14 May 2024 17:11:53 +1000 Stephen Rothwell
wrote:
>
> After merging the amdgpu tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h:580: warning: Function parameter
> or struct member &
Hi all,
On Wed, 1 May 2024 15:19:29 +1000 Stephen Rothwell
wrote:
>
> After merging the amdgpu tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h:581: warning: Function
> parameter or struct memb
Hi all,
On Mon, 22 Apr 2024 09:56:42 +1000 Stephen Rothwell
wrote:
>
> On Tue, 30 Jan 2024 13:56:26 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the amdgpu tree, today's linux-next build (htmldocs)
> > produced this warning:
> >
> &
Hi all,
On Mon, 22 Apr 2024 09:54:48 +1000 Stephen Rothwell
wrote:
>
> On Tue, 30 Jan 2024 13:54:21 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the amdgpu tree, today's linux-next build (htmldocs)
> > produced this warning:
> >
> > d
1 - 100 of 1095 matches
Mail list logo