Skip to content

Commit 1d15880

Browse files
Darksonnojeda
authored andcommitted
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 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]>
1 parent e26fa54 commit 1d15880

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rust/bindings/bindings_helper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88

99
#include <kunit/test.h>
10-
#include <linux/blk_types.h>
1110
#include <linux/blk-mq.h>
11+
#include <linux/blk_types.h>
1212
#include <linux/blkdev.h>
1313
#include <linux/errname.h>
1414
#include <linux/ethtool.h>

0 commit comments

Comments
 (0)