On Thu, 15 Aug 2024 10:30:26 +0000 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, the include approach indeed looks cleaner. Reviewed-by: Gary Guo <gary@xxxxxxxxxxx> > > --- > > Changes since v2 [2]: > - Rebase on 6.11-rc3. > - Use `cpp` instead of Makefile scripting to concatenate files. > > Link: > https://lore.kernel.org/rust-for-linux/20240507210818.672517-1-ojeda@xxxxxxxxxx/ [2] > --- > rust/Makefile | 6 +- > rust/helpers.c | 239 ------------------------------------ > rust/helpers/README.md | 17 +++ > rust/helpers/blk.c | 16 +++ > rust/helpers/bug.c | 9 ++ > rust/helpers/build_assert.c | 25 ++++ > rust/helpers/build_bug.c | 10 ++ > rust/helpers/err.c | 22 ++++ > rust/helpers/helpers.c | 18 +++ > rust/helpers/kunit.c | 10 ++ > rust/helpers/mutex.c | 10 ++ > rust/helpers/page.c | 24 ++++ > rust/helpers/refcount.c | 22 ++++ > rust/helpers/signal.c | 10 ++ > rust/helpers/slab.c | 10 ++ > rust/helpers/spinlock.c | 27 ++++ > rust/helpers/task.c | 22 ++++ > rust/helpers/uaccess.c | 17 +++ > rust/helpers/wait.c | 10 ++ > rust/helpers/workqueue.c | 16 +++ > 20 files changed, 298 insertions(+), 242 deletions(-) > delete mode 100644 rust/helpers.c > create mode 100644 rust/helpers/README.md > create mode 100644 rust/helpers/blk.c > create mode 100644 rust/helpers/bug.c > create mode 100644 rust/helpers/build_assert.c > create mode 100644 rust/helpers/build_bug.c > create mode 100644 rust/helpers/err.c > create mode 100644 rust/helpers/helpers.c > create mode 100644 rust/helpers/kunit.c > create mode 100644 rust/helpers/mutex.c > create mode 100644 rust/helpers/page.c > create mode 100644 rust/helpers/refcount.c > create mode 100644 rust/helpers/signal.c > create mode 100644 rust/helpers/slab.c > create mode 100644 rust/helpers/spinlock.c > create mode 100644 rust/helpers/task.c > create mode 100644 rust/helpers/uaccess.c > create mode 100644 rust/helpers/wait.c > create mode 100644 rust/helpers/workqueue.c
