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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1151 bytes --]

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 origin tree and commits:

  1a869168d91f1 ("drm/xe/sysfs: Add cleanup action in xe_device_sysfs_init")
  a2d6223d224f3 ("drm/xe/vf: Don't expose sysfs attributes not applicable for VFs")
  fb3c27a69c473 ("drm/xe/sysfs: Simplify sysfs registration")

from the drm tree.

I fixed it up (see below) and can carry the fix 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 particularly
complex conflicts.

diff --cc drivers/gpu/drm/xe/xe_device_sysfs.c
index 927ee7991696b,c5151c86a98ae..0000000000000
--- a/drivers/gpu/drm/xe/xe_device_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_device_sysfs.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

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: vendor-prefixes: Add Mayqueen name")

from the drm tree.

I fixed it up (see below) and can carry the fix 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 particularly
complex conflicts.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 7aa17199ea434,49a5117d2bbb0..0000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -965,8 -935,8 +967,10 @@@ patternProperties
      description: Maxim Integrated Products
    "^maxlinear,.*":
      description: MaxLinear Inc.
 +  "^maxtor,.*":
 +    description: Maxtor Corporation
+   "^mayqueen,.*":
+     description: Mayqueen Technologies Ltd.
    "^mbvl,.*":
      description: Mobiveil Inc.
    "^mcube,.*":

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]

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 allocations")
  8e92c9902ff11 ("rust: alloc: vmalloc: implement Vmalloc::to_page()")

from the drm tree.

I fixed it up (see below) and can carry the fix 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 particularly
complex conflicts.

diff --cc rust/kernel/alloc/allocator.rs
index 6426ba54cf98d,84ee7e9d7b0eb..0000000000000
--- a/rust/kernel/alloc/allocator.rs
+++ b/rust/kernel/alloc/allocator.rs
@@@ -13,11 -13,14 +13,15 @@@ use core::alloc::Layout
  use core::ptr;
  use core::ptr::NonNull;
  
 -use crate::alloc::{AllocError, Allocator};
 +use crate::alloc::{AllocError, Allocator, NumaNode};
  use crate::bindings;
+ use crate::page;
 -use crate::pr_warn;
 +
 +const ARCH_KMALLOC_MINALIGN: usize = bindings::ARCH_KMALLOC_MINALIGN;
  
+ mod iter;
+ pub use self::iter::VmallocPageIter;
+ 
  /// The contiguous kernel allocator.
  ///
  /// `Kmalloc` is typically used for physically contiguous allocations up to page size, but also

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Danilo Krummrich]

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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 958 bytes --]

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 Power Gating")
  ecab82af27873 ("drm/xe/vf: Don't support gtidle if VF")

from the drm tree.

I fixed it up (see below) and can carry the fix 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 particularly
complex conflicts.


diff --cc drivers/gpu/drm/xe/xe_gt_idle.c
index 944770fb2daff,67aba41405100..0000000000000
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1002 bytes --]

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/display: Refactor input mode programming for DIG FIFO")

from the drm tree.

I fixed it up (see below) and can carry the fix 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 particularly
complex conflicts.

diff --cc drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
index 199781233fd5f,428912f371291..0000000000000
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]