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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  rust/kernel/lib.rs

between commit:

  d1aa40daa777c ("rust: kbuild: remove `feature(...)`s that are now stable")

from the origin tree and commits:

  f9f0b4a1f35d3 ("rust: interop: Add list module for C linked list interface")
  80df573af9ef3 ("rust: drm: gem: shmem: Add DRM shmem helper abstraction")

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 --combined rust/kernel/lib.rs
index 5d22892447bdd,40de00ce4f971..0000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -16,17 -16,50 +16,17 @@@
  // Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on
  // the unstable features in use.
  //
 -// Stable since Rust 1.79.0.
 -#![feature(generic_nonzero)]
 -#![feature(inline_const)]
 -#![feature(pointer_is_aligned)]
 -#![feature(slice_ptr_len)]
 -//
 -// Stable since Rust 1.80.0.
 -#![feature(slice_flatten)]
 -//
 -// Stable since Rust 1.81.0.
 -#![feature(lint_reasons)]
 -//
 -// Stable since Rust 1.82.0.
 -#![feature(offset_of_nested)]
 -#![feature(raw_ref_op)]
 -//
 -// Stable since Rust 1.83.0.
 -#![feature(const_maybe_uninit_as_mut_ptr)]
 -#![feature(const_mut_refs)]
 -#![feature(const_option)]
 -#![feature(const_ptr_write)]
 -#![feature(const_refs_to_cell)]
 -#![feature(const_refs_to_static)]
 -//
 -// Stable since Rust 1.84.0.
 -#![feature(strict_provenance)]
 -//
  // Stable since Rust 1.89.0.
  #![feature(generic_arg_infer)]
  //
  // Expected to become stable.
  #![feature(arbitrary_self_types)]
 +#![feature(derive_coerce_pointee)]
  //
  // To be determined.
  #![feature(used_with_arg)]
  //
 -// `feature(derive_coerce_pointee)` is expected to become stable. Before Rust
 -// 1.84.0, it did not exist, so enable the predecessor features.
 -#![cfg_attr(CONFIG_RUSTC_HAS_COERCE_POINTEE, feature(derive_coerce_pointee))]
 -#![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(coerce_unsized))]
 -#![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(dispatch_from_dyn))]
 -#![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(unsize))]
 -//
 -// `feature(file_with_nul)` is expected to become stable. Before Rust 1.89.0, it did not exist, so
 +// `feature(file_with_nul)` is stable since Rust 1.92.0. Before Rust 1.89.0, it did not exist, so
  // enable it conditionally.
  #![cfg_attr(CONFIG_RUSTC_HAS_FILE_WITH_NUL, feature(file_with_nul))]
  
@@@ -49,6 -82,7 +49,6 @@@ pub mod bits
  #[cfg(CONFIG_BLOCK)]
  pub mod block;
  pub mod bug;
 -#[doc(hidden)]
  pub mod build_assert;
  pub mod clk;
  #[cfg(CONFIG_CONFIGFS_FS)]
@@@ -72,12 -106,15 +72,15 @@@ pub mod faux
  pub mod firmware;
  pub mod fmt;
  pub mod fs;
+ #[cfg(CONFIG_GPU_BUDDY = "y")]
+ pub mod gpu;
  #[cfg(CONFIG_I2C = "y")]
  pub mod i2c;
  pub mod id_pool;
  #[doc(hidden)]
  pub mod impl_flags;
  pub mod init;
+ pub mod interop;
  pub mod io;
  pub mod ioctl;
  pub mod iommu;
@@@ -116,8 -153,10 +119,8 @@@ pub mod scatterlist
  pub mod security;
  pub mod seq_file;
  pub mod sizes;
 -pub mod slice;
  #[cfg(CONFIG_SOC_BUS)]
  pub mod soc;
 -mod static_assert;
  #[doc(hidden)]
  pub mod std_vendor;
  pub mod str;

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