[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wjZsdKQVkVNZ3XP2UncbYdyF0BDZpM5dLgN6PksTcfAXQ@mail.gmail.com>
Date: Mon, 1 Dec 2025 13:53:02 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Christian Brauner <brauner@...nel.org>, Mike Snitzer <snitzer@...nel.org>
Cc: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL 08/17 for v6.19] cred guards
On Fri, 28 Nov 2025 at 08:51, Christian Brauner <brauner@...nel.org> wrote:
>
> Merge conflicts with mainline
>
> diff --cc fs/nfs/localio.c
So I ended up merging this very differently from how you did it.
I just wrapped 'nfs_local_call_read()' for the cred guarding the same
way the 'nfs_local_call_write()' side had been done.
That made it much easier to see that the changes by Mike were carried
over, and seems cleaner anyway.
But it would be good if people double-checked my change. It looks
"ObviouslyCorrect(tm)" to me, but...
Linus
Powered by blists - more mailing lists