From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Oct 2025 20:05:13 +0000 (-1000)
Subject: Merge tag 'rust-rustfmt' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c64efcb083c48c85227cb4d72ab137feef2cdac;p=users%2Fhch%2Fmisc.git

Merge tag 'rust-rustfmt' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux

Pull rustfmt fixes from Miguel Ojeda:
 "Rust 'rustfmt' cleanup

  'rustfmt', by default, formats imports in a way that is prone to
  conflicts while merging and rebasing, since in some cases it condenses
  several items into the same line.

  Document in our guidelines that we will handle this for the moment
  with the trailing empty comment workaround and make the tree
  'rustfmt'-clean again"

* tag 'rust-rustfmt' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
  rust: bitmap: fix formatting
  rust: cpufreq: fix formatting
  rust: alloc: employ a trailing comment to keep vertical layout
  docs: rust: add section on imports formatting
---

1c64efcb083c48c85227cb4d72ab137feef2cdac