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

[Christian Brauner]

On Tue, Nov 19, 2024 at 04:33:45PM -0800, Linus Torvalds wrote:
> 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.

Wait, I'm confused. I definitely pulled that branch the day after Thomas
gave it to me and in my vfs.mgtime branch I clearly see:

commit d7c898a73f875bd205df53074c1d542766171da1
Merge: 8cf0b93919e1 2a15385742c6
Author:     Christian Brauner <brauner@xxxxxxxxxx>
AuthorDate: Mon Oct 7 12:47:19 2024 +0200
Commit:     Christian Brauner <brauner@xxxxxxxxxx>
CommitDate: Thu Oct 10 10:20:57 2024 +0200

    Merge tag 'timers-core-for-vfs' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tip/tip into vfs.mgtime

    Timekeeping interfaces for consumption by the VFS tree.

    Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>

Unless I did something odd during the pull?