On Fri, Aug 9, 2024 at 3:28 PM Alice Ryhl <aliceryhl@xxxxxxxxxx> wrote: > > The headers in this file are sorted alphabetically, which makes it > easy to quickly resolve conflicts by selecting all of the headers and > invoking :'<,'>sort to sort them. To keep this technique to resolve > conflicts working, also apply sorting to symbols that are not letters. > > This file is very prone to merge conflicts, so I think keeping conflict > resolution really easy is more important than not messing with git blame > history. > > These includes were originally introduced in commit 3253aba3408a ("rust: > block: introduce `kernel::block::mq` module"). > > Signed-off-by: Alice Ryhl <aliceryhl@xxxxxxxxxx> Applied to `rust-next` -- thanks everyone! Cheers, Miguel