Re: [git pull] drm for 6.17-rc1

[Miguel Ojeda <ojeda@kernel.org>]

On Thu, 31 Jul 2025 03:11:15 +0000 pr-tracker-bot@kernel.org wrote:
>
> The pull request you sent on Wed, 30 Jul 2025 07:05:51 +1000:
>
> > https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2025-07-30
>
> has been merged into torvalds/linux.git:
> https://git.kernel.org/torvalds/c/260f6f4fda93c8485c8037865c941b42b9cba5d2

I know you are particularly busy this merge window, but if this diff
could be applied between merges at some point, it would be nice.

I put it below in the form of a patch with similar wording to another
one you did in case it saves you time.

Thanks!

Cheers,
Miguel

From: Miguel Ojeda <ojeda@kernel.org>
Date: Thu, 31 Jul 2025 21:41:37 +0200
Subject: [PATCH] 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>
---
 drivers/gpu/nova-core/driver.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;


base-commit: 831462ff3ec61fd2e6726b534a351a1a722bf2ab
--
2.50.1