linux-kernel - Re: [PATCH v3 2/2 RESEND] checkpatch: warn on empty rust doc comments

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANiq72nKBz1myZi5guA5uPCwwtUvjfF80dOx5saHvjMU-g6mpw@mail.gmail.com>
Date: Mon, 30 Sep 2024 12:44:07 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Hridesh MG <hridesh699@...il.com>
Cc: Patrick Miller <paddymills@...ton.me>, Trevor Gross <tmgross@...ch.edu>, 
	linux-kernel@...r.kernel.org, rust-for-linux@...r.kernel.org, 
	Andy Whitcroft <apw@...onical.com>, Joe Perches <joe@...ches.com>, 
	Dwaipayan Ray <dwaipayanray1@...il.com>, Lukas Bulwahn <lukas.bulwahn@...il.com>, 
	Miguel Ojeda <ojeda@...nel.org>, Alex Gaynor <alex.gaynor@...il.com>, 
	Wedson Almeida Filho <wedsonaf@...il.com>, Boqun Feng <boqun.feng@...il.com>, Gary Guo <gary@...yguo.net>, 
	Björn Roy Baron <bjorn3_gh@...tonmail.com>, 
	Benno Lossin <benno.lossin@...ton.me>, Andreas Hindborg <a.hindborg@...sung.com>, 
	Alice Ryhl <aliceryhl@...gle.com>, linux-newbie@...r.kernel.org
Subject: Re: [PATCH v3 2/2 RESEND] checkpatch: warn on empty rust doc comments

On Mon, Sep 30, 2024 at 12:35 PM Hridesh MG <hridesh699@...il.com> wrote:
>
> However, I was curious how conflicts like these are generally
> resolved. For example, if there are two large patchsets which conflict
> with each other, how does one ensure that they are compatible, and
> even if they are, how do the maintainers ensure that they are applied
> in the correct order?

The maintainers will usually figure it out (resolving the conflicts
when they apply them, applying them in the right order, etc.).
Otherwise, they can also ask for one of them to be resubmitted on top
of the other when it is too involved / subtle / large series.

If you are aware that you need a patch to be put on top of another,
then you can rebase it yourself of course. Just please make it clear
in the cover letter (or after the `---` part) what the patches apply
against.

Cheers,
Miguel