Skip to content

Commit

Permalink
rust: sort blk includes in bindings_helper.h
Browse files Browse the repository at this point in the history
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 3253aba ("rust:
block: introduce `kernel::block::mq` module").

Signed-off-by: Alice Ryhl <[email protected]>
Acked-by: Danilo Krummrich <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Miguel Ojeda <[email protected]>
  • Loading branch information
Darksonn authored and ojeda committed Aug 20, 2024
1 parent e26fa54 commit 1d15880
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rust/bindings/bindings_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 1d15880

Please sign in to comment.