rust: sort blk includes in bindings_helper.h
authorAlice Ryhl <aliceryhl@google.com>
Fri, 9 Aug 2024 13:28:35 +0000 (13:28 +0000)
committerMiguel Ojeda <ojeda@kernel.org>
Tue, 20 Aug 2024 22:37:02 +0000 (00:37 +0200)
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@google.com>
Acked-by: Danilo Krummrich <dakr@kernel.org>
Link: https://lore.kernel.org/r/20240809132835.274603-1-aliceryhl@google.com
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
rust/bindings/bindings_helper.h

index b940a5777330454815092567b2973715b1157ab2..ae82e9c941afa17c48737d2b2e49ac6d26f670b1 100644 (file)
@@ -7,8 +7,8 @@
  */
 
 #include <kunit/test.h>
-#include <linux/blk_types.h>
 #include <linux/blk-mq.h>
+#include <linux/blk_types.h>
 #include <linux/blkdev.h>
 #include <linux/errname.h>
 #include <linux/ethtool.h>