On Thu, Aug 15, 2024 at 12:30 PM Andreas Hindborg <nmi@xxxxxxxxxxxx> wrote: > > From: Andreas Hindborg <a.hindborg@xxxxxxxxxxx> > > This patch splits up the rust helpers C file. When rebasing patch sets on > upstream linux, merge conflicts in helpers.c is common and time consuming > [1]. Thus, split the file so that each kernel component can live in a > separate file. > > This patch lists helper files explicitly and thus conflicts in the file > list is still likely. However, they should be more simple to resolve than > the conflicts usually seen in helpers.c. > > Link: https://rust-for-linux.zulipchat.com/#narrow/stream/288089-General/topic/Splitting.20up.20helpers.2Ec/near/426694012 [1] > Signed-off-by: Andreas Hindborg <a.hindborg@xxxxxxxxxxx> Thanks Andreas for rebasing and resubmitting this for 6.12. Unless someone has an issue with it, we would like to pick this up soon (i.e. in a few days) to reduce the amount of conflicts for others working with many series outside. Boqun suggested the `#include` approach for this v3 yesterday, and indeed it is a nice simplification. Cheers, Miguel