On 10/2/25 2:05 PM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
(I think this was a conflict between the DRM tree and the MM tree already
before.)
The resolution looks good to me, thanks!
- Danilo
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.yaml
between commit:
4ed46073274a5 ("dt-bindings: vendor-prefixes: Add undocumented vendor
prefixes")
from the origin tree and commit:
09b26dce32f0d ("dt-bindings: vend
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
rust/kernel/alloc/allocator.rs
between commit:
1b1a946dc2b53 ("rust: alloc: specify the minimum alignment of each allocator")
from the origin tree and commits:
1738796994a43 ("rust: support large alignments in allocatio
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_device_sysfs.c
between commits:
ff89a4d285c82 ("drm/xe/sysfs: Add cleanup action in xe_device_sysfs_init")
500dad428e5b0 ("drm/xe/vf: Don't expose sysfs attributes not applicable for
VFs")
from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_gt_idle.c
between commit:
2470b141bfae2 ("drm/xe: move disable_c6 call")
from the origin tree and commits:
6800e63cf97ba ("drm/xe: move disable_c6 call")
38e8c4184ea0e ("drm/xe: Enable Coarse Pow
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
between commit:
c03d770c0b014 ("drm/amd/display: Attempt to avoid empty TUs when endpoint is
DPIA")
from the origin tree and commit:
0127f0445f7c1 ("drm/amd/displa
