diff options
| author |   Miguel Ojeda <ojeda@kernel.org> | 2025-07-31 21:41:37 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-31 13:24:26 -0700 |
| commit | 924740496b6c51d4be235f2b169fe93635c0fcee (patch) | |
| tree | f4a167adae8a5293a3e7c1d4d04400597ff48106 | |
| parent | Merge tag 'media/v6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| download | wireguard-linux-924740496b6c51d4be235f2b169fe93635c0fcee.tar.xz wireguard-linux-924740496b6c51d4be235f2b169fe93635c0fcee.zip | |
gpu: nova-core: fix up formatting after merge
In the merge 260f6f4fda93 ("Merge tag 'drm-next-2025-07-30' of
https://gitlab.freedesktop.org/drm/kernel"), the formatting in the
conflict resolution doesn't match what `make rustfmt` wants to make it.
Fix it up appropriately.
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/gpu/nova-core/driver.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs index cb68d0bc1e63..5749bad9c285 100644 --- a/drivers/gpu/nova-core/driver.rs +++ b/drivers/gpu/nova-core/driver.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sync::Arc, sizes::SZ_16M}; +use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sizes::SZ_16M, sync::Arc}; use crate::gpu::Gpu; |