linux-next: manual merge of the rust-timekeeping tree with the drm-nova tree

[Stephen Rothwell]

Hi all,

After merging the rust-timekeeping tree, today's linux-next build
(x86_64 allmodconfig) failed like this:

error[E0599]: no method named `as_nanos` found for struct `Delta` in the current scope
  --> drivers/gpu/nova-core/util.rs:45:33
   |
45 |         if start_time.elapsed().as_nanos() > timeout.as_nanos() as i64 {
   |                                 ^^^^^^^^ method not found in `Delta`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0599`.

Caused by commits

  2ed94606a0fe ("rust: time: Rename Delta's methods from as_* to into_*")
  768dfbfc98e2 ("rust: time: Make Instant generic over ClockSource")

interacting with commit

  a03c9bd953c2 ("gpu: nova-core: add helper function to wait on condition")

from the drm-nova tree.

I tried to fix it up, but this lead down a rabbit hole and my rust
skills are poor, so I just dropped the rust-timekeeping tree for today.
A merge resolution would be appreciated.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp5N8ghyb_OD.pgp
Description: OpenPGP digital signature