On 8/9/24 3:28 PM, Alice Ryhl 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>
Now as before, feel free to add
Acked-by: Danilo Krummrich <dakr@xxxxxxxxxx>
---
Changes since v1:
- Reword commit message.
v1: https://lore.kernel.org/r/20240809064222.3527881-1-aliceryhl@xxxxxxxxxx
rust/bindings/bindings_helper.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index b940a5777330..ae82e9c941af 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -6,9 +6,9 @@
* Sorted alphabetically.
*/
#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>
base-commit: de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed
