linux-kernel - Re: [PATCH v2] rust: sort blk includes in bindings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CANiq72nFOYA6oZ4rECBsq3U9CGzMoN8zUz+4PrVWHetzNcAXiA@mail.gmail.com>
Date: Thu, 22 Aug 2024 00:12:57 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Alice Ryhl <aliceryhl@...gle.com>
Cc: Jens Axboe <axboe@...nel.dk>, Miguel Ojeda <ojeda@...nel.org>, 
	Andreas Hindborg <a.hindborg@...sung.com>, Danilo Krummrich <dakr@...nel.org>, linux-block@...r.kernel.org, 
	rust-for-linux@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] rust: sort blk includes in bindings_helper.h

On Fri, Aug 9, 2024 at 3:28 PM Alice Ryhl <aliceryhl@...gle.com> 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@...gle.com>

Applied to `rust-next` -- thanks everyone!

Cheers,
Miguel