On Mon, Sep 30, 2024 at 12:35 PM Hridesh MG <hridesh699@xxxxxxxxx> 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
