[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wh81Obo3jzHuB6eg_a8x2ObjRG1Oa7g_B5qWK-uds=thg@mail.gmail.com>
Date: Tue, 26 Nov 2024 13:25:47 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Christian Brauner <brauner@...nel.org>
Cc: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Rust bindings for pid namespaces
On Tue, 26 Nov 2024 at 03:08, Christian Brauner <brauner@...nel.org> wrote:
>
> There'll be a merge conflict that should be resolved as below. The diff
> looks huge but the resolution hopefully shouldn't be complicated. I also
> pushed the following branch:
>
> gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs rust-v6.13.pid_namespace
>
> Where you can just steal the rust/kernel/task.rs file from.
Well, my merge resolution looks a bit different, since I ended up also
fixing up your self.0.get() to use the new self.as_ptr() model.
And I ended up putting that as_ptr() definition in a different
location (just before the first use, like it used to be).
But I think the end result is equivalent.
Linus
Powered by blists - more mailing lists