From: Alice Ryhl Date: Fri, 9 Aug 2024 13:28:35 +0000 (+0000) Subject: rust: sort blk includes in bindings_helper.h X-Git-Tag: v6.12-rc1~55^2~40 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1d15880378662ade209eb9289f9f03c98b431254;p=linux-block.git rust: sort blk includes in bindings_helper.h 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 Acked-by: Danilo Krummrich Link: https://lore.kernel.org/r/20240809132835.274603-1-aliceryhl@google.com Signed-off-by: Miguel Ojeda --- 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 @@ -7,8 +7,8 @@ */ #include -#include #include +#include #include #include #include