Re: [GIT pull] timers/core for v6.13-rc1

[Linus Torvalds]

On Mon, 18 Nov 2024 at 11:22, Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
>

>   - Core infrastructure for VFS multigrain timestamping
>
>     This is required to allow the kernel to use coarse grained time stamps
>     by default and switch to fine grained time stamps when inode attributes
>     are actively observed via getattr().
>
>     These changes have been provided to the VFS tree as well, so that the
>     VFS specific infrastructure could be built on top.

Bah. Except the vfs tree didn't take it as a shared branch, but
instead cherry-picked the commits and as a result they are duplicate
and caused a (trivial) merge conflict.

Oh well.

                 Linus