Skip to content

Commit 9247404

Browse files
ojedatorvalds
authored andcommitted
gpu: nova-core: fix up formatting after merge
In the merge 260f6f4 ("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>
1 parent 0cdee26 commit 9247404

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/nova-core/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22

3-
use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sync::Arc, sizes::SZ_16M};
3+
use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sizes::SZ_16M, sync::Arc};
44

55
use crate::gpu::Gpu;
66

0 commit comments

Comments
 (0)