Re: linux-next: manual merge of the char-misc tree with the security tree

[Alice Ryhl <aliceryhl@google.com>]

On Mon, Jul 20, 2026 at 06:45:23PM -0400, Paul Moore wrote:
> On Mon, Jul 20, 2026 at 10:48 AM Mark Brown <broonie@kernel.org> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> >   rust/kernel/task.rs
> >
> > between commits:
> >
> >   ef2d3e4635761 ("rust: task: clarify comments on task UID accessors")
> >   15c1f17979712 ("cred: delete task_euid()")
> >
> > from the security tree and commit:
> >
> >   2847d9ab088bb ("rust_binder: Add dynamic debug logging mask")
> >
> > from the char-misc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > diff --cc rust/kernel/task.rs
> > index c2b3457b700c1,1b290c61714db..0000000000000
> > --- a/rust/kernel/task.rs
> > +++ b/rust/kernel/task.rs
> > @@@ -210,7 -210,14 +210,14 @@@ impl Task
> >           unsafe { *ptr::addr_of!((*self.as_ptr()).pid) }
> >       }
> >
> > +     /// Returns the TGID (Thread Group ID / Process ID) of the given task.
> > +     pub fn tgid(&self) -> Pid {
> > +         // SAFETY: The tgid of a task never changes after initialization, so reading this field is
> > +         // not a data race.
> > +         unsafe { *ptr::addr_of!((*self.as_ptr()).tgid) }
> > +     }
> > +
> >  -    /// Returns the UID of the given task.
> >  +    /// Returns the objective real UID of the given task.
> >       #[inline]
> >       pub fn uid(&self) -> Kuid {
> >           // SAFETY: It's always safe to call `task_uid` on a valid task.
> 
> Thanks Mark, that fixup looks reasonable to me.

Looks good to me as well.

Alice