edesktop.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
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
diff -
crtc->debugfs_entry, lcrtc,
| ^~~
| bus_create_file
Caused by commits
9e2b84fb6cd7 ("drm/print: drop include seq_file.h")
33d5ae6cacf4 ("drm/print: drop include debugfs.h and include where needed")
I have used the drm-misc tree from next-
--
Cheers,
Stephen Rothwell
pgpApZRukCgBT.pgp
Description: OpenPGP digital signature
neric get_scanout_buffer() for drm_panic")
--
Cheers,
Stephen Rothwell
pgpSFv3JO44i2.pgp
Description: OpenPGP digital signature
Hi all,
On Fri, 12 Apr 2024 16:58:26 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/drm_plane.c:1767: warning: expecting prototype for
> drm_plane_add_size_hint_pro
9677547d8362 ("drm: Introduce plane SIZE_HINTS property")
--
Cheers,
Stephen Rothwell
pgpJIpoyasKje.pgp
Description: OpenPGP digital signature
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
pgpuCgWAcxEJ1.pgp
Description: OpenPGP digital signature
Hi Mitul,
Thanks.
On Fri, 5 Apr 2024 12:21:59 +0530 Mitul Golani
wrote:
>
> Correct struct member name to 'mode' instead of 'operation mode'
> in 'drm_dp_as_sdp' structure description.
>
> Fixes: 0bbb8f594e33 ("drm/dp: Add Adaptive Sync SDP logging")
Reported-by
member
'operation_mode' description in 'drm_dp_as_sdp'
Introduced by commit
0bbb8f594e33 ("drm/dp: Add Adaptive Sync SDP logging")
--
Cheers,
Stephen Rothwell
pgph2aHlroqT0.pgp
Description: OpenPGP digital signature
have used the drm-misc tree from next-20240402 for today.
--
Cheers,
Stephen Rothwell
pgpHuhSODs95K.pgp
Description: OpenPGP digital signature
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
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
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/MAINTAINERS
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
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/i915/display/intel_dp.c
index 94d2a15d8444,6ece2c563c7a..
--- a/drivers/gpu/drm/i91
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
t'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
build problem.
Tested-by: Stephen Rothwell # compile only
--
Cheers,
Stephen Rothwell
pgpWCPWlgMfWr.pgp
Description: OpenPGP digital signature
th 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
actually be fixed in the drm-misc-fixes tree).
From: Stephen Rothwell
Date:
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
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
(struct rzg2l_du_vsp *vsp, struct
device_node *np,
| ^
Caused by commit
768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
I have used the drm-misc tree from next-20240221 for today.
--
Cheers,
Stephen Rothwell
pgp5Yv6hyy52w.pgp
Descriptio
ubmitted 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
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_ttm_place
thods")
--
Cheers,
Stephen Rothwell
pgpSiSHHKSJm5.pgp
Description: OpenPGP digital signature
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
lid 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
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_pages' at
> dri
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_busy_placement'; did
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 today:
From: Stephen Rothwell
Date: Tue, 6 Feb 2024 15:1
s")
(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 placement wi
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 use FORCE
ur 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..
--- a/drivers/gp
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)
> >> produced th
ubmitted 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..
--- a/drivers/
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
pgpZy4vfdT_jj.pgp
Descript
from next-20231124 for today.
--
Cheers,
Stephen Rothwell
pgptYMmYNM7d1.pgp
Description: OpenPGP digital signature
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
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/display:
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/displa
ur 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
ts 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/ivpu/ivp
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 drivers
/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: OpenP
,
Stephen Rothwell
pgpiyOLMv2tOn.pgp
Description: OpenPGP digital signature
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
ur 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
consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgpYZZTKt7FPq.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/accel/ivpu/ivpu_ipc.c
index a4ca40b184d4,618dbc17df80..
--- a/drivers/accel/ivpu/ivpu_ipc.c
+++ b/drivers/accel/ivpu/ivpu_ipc.c
@@@ -
consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/accel/ivpu/ivpu_drv.c
index 790603017653,51fa60b6254c..
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@@ -3
Hi all,
Commit
0da611a87021 ("dma-buf: add dma_fence_timestamp helper")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpVEQIISTHPP.pgp
Description: OpenPGP digital signature
Hi all,
On Wed, 18 Oct 2023 12:46:36 +1100 Stephen Rothwell
wrote:
>
> On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> > arch/ia64/include/asm/fb.h
> >
>
Hi all,
On Thu, 12 Oct 2023 12:27:49 +1100 Stephen Rothwell
wrote:
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > d
Hi all,
On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> arch/ia64/include/asm/fb.h
>
> between commit:
>
> cf8e8658100d ("arch: Remove Itanium (IA-64) architecture&quo
. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgpllvmjWIktX.pgp
Description: OpenPGP digital signature
Hi all,
On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> drivers/usb/typec/altmodes
tmodes/displayport: Signal hpd low when exiting
mode")
from the usb.current tree.
I have applied the following merge fix patch.
From: Stephen Rothwell
Date: Thu, 12 Oct 2023 12:17:31 +1100
Subject: [PATCH] fix up for "drm: Add HPD state to
drm_connector_oob_hotplug_event()"
intera
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.
--
Cheers,
Stephe
t;drm/nouveau: exec: report max pushs through getparam")
--
Cheers,
Stephen Rothwell
pgpwcj6Di6jNK.pgp
Description: OpenPGP digital signature
Hi all,
After merging the drm-misc tree, today's linux-next build (htmldocs)
produced this warning:
Documentation/gpu/panfrost.rst: WARNING: document isn't included in any toctree
Introduced by commit
f11b0417eec2 ("drm/panfrost: Add fdinfo support GPU load metrics")
--
Cheer
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 particularly
comp
consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/accel/ivpu/ivpu_fw.c
index 0191cf8e5964,d57e103aae1c..
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@@
t;drm/gpuvm: rename struct drm_gpuva_manager to struct
drm_gpuvm")
--
Cheers,
Stephen Rothwell
pgphiWJxtKLWJ.pgp
Description: OpenPGP digital signature
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/accel/qaic/qaic_data.c
index f4b06792c6f1,c90fa6a430f6..
--- a/drivers/accel/qaic/qaic_data.c
+++ b/drivers/accel/qaic/qaic_data.c
@@@ -1018,
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
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
pgpx5Q6F41a8p.pgp
Description: OpenPGP digital signature
today.
--
Cheers,
Stephen Rothwell
pgpEToMq80uLP.pgp
Description: OpenPGP digital signature
Introduced by commit
6b252cf42281 ("drm/nouveau: nvkm/vmm: implement raw ops to manage uvmm")
--
Cheers,
Stephen Rothwell
pgp6JYkTvvPS1.pgp
Description: OpenPGP digital signature
vices to follow panel state")
--
Cheers,
Stephen Rothwell
pgpP4YEp06OoZ.pgp
Description: OpenPGP digital signature
Hi all,
After merging the drm-misc tree, today's linux-next build (htmldocs)
produced this warning:
Documentation/gpu/todo.rst:469: ERROR: Unexpected indentation.
Introduced by commit
d2aacaf07395 ("drm/panel: Check for already prepared/enabled in drm_panel")
--
Cheers,
Stephe
ainer 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
pgpddYrD_HyZv.pgp
Description: OpenPGP digital signature
Hi all,
On Tue, 27 Jun 2023 11:54:32 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> include/drm/gpu_scheduler.h
>
> between commit:
>
> db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from
. 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 b29e347b10a9,e95b4837e5a3..
--- a/include/drm/gpu_scheduler.h
+++ b/include
^
cc1: all warnings being treated as errors
Caused by commit
4481913607e5 ("drm/ttm: fix bulk_move corruption when adding a entry")
I have used the drm-misc-fixes tree from next-20230622 for today.
--
Cheers,
Stephen Rothwell
pgpOtDee3Xwhe.pgp
Description: OpenPGP digital signature
Hi all,
On Tue, 30 May 2023 11:57:52 +1000 Stephen Rothwell
wrote:
>
> @@@ -920,33 -587,8 +640,9 @@@ static const struct intel_device_info j
> #define GEN12_FEATURES \
> GEN11_FEATURES, \
> GEN(12), \
> - .display.abox_mask = GENMASK(2, 1), \
> - .__ru
g tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_drv.h
index f23b030aaf09,e9c403def9c9..
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -407,11 -408,13 +408,13 @@@ static inline struc
ioned 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/i915_pci.c
index 75cbcc
consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 8e18bbafa740,7cc2bfa4af6f..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6700,6 -6663,35 +6700,12 @@@ S:Maintaine
. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgphktCW08XDc.pgp
Description: OpenPGP digital signature
ned 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
pgp_UqgF6UlMV.pgp
Description: OpenPGP digital signature
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
ime 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
ned 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
sched: Create wrapper to add a syncobj dependency to job")
--
Cheers,
Stephen Rothwell
pgpbkt0BxMKAA.pgp
Description: OpenPGP digital signature
rivial 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
ned 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/i915_driver.c
index cf1c0970ecb4,4a2dc4
moving
console.")
in the drm-fixes tree.
--
Cheers,
Stephen Rothwell
pgppQtV1gtJqw.pgp
Description: OpenPGP digital signature
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:
> &
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
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 drivers/gpu/drm/drm_fbde
. 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
+++ b/
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
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..
--- a/d
uot;)
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/fb-helper: Set framebuffer for vga-switcheroo
clients"
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/drm_f
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/drivers/gpu/drm
el-fixes tree.
--
Cheers,
Stephen Rothwell
pgpTKePF2RJ4i.pgp
Description: OpenPGP digital signature
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
ro-length array of trailing
structs with flex-array")
in the drm-misc tree.
--
Cheers,
Stephen Rothwell
pgpazNsBngQ0D.pgp
Description: OpenPGP digital signature
rging. 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
1 - 100 of 691 matches
Mail list logo
