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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241120-nennwert-hausfassade-e515eddb6198@brauner>
Date: Wed, 20 Nov 2024 16:48:11 +0100
From: Christian Brauner <brauner@...nel.org>
To: Ingo Molnar <mingo@...nel.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>, 
	Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org, x86@...nel.org
Subject: Re: [GIT pull] timers/core for v6.13-rc1

On Wed, Nov 20, 2024 at 01:12:28PM +0100, Ingo Molnar wrote:
> 
> * Christian Brauner <brauner@...nel.org> wrote:
> 
> > On Tue, Nov 19, 2024 at 04:33:45PM -0800, Linus Torvalds wrote:
> > > On Mon, 18 Nov 2024 at 11:22, Thomas Gleixner <tglx@...utronix.de> 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@...nel.org>
> > AuthorDate: Mon Oct 7 12:47:19 2024 +0200
> > Commit:     Christian Brauner <brauner@...nel.org>
> > 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@...nel.org>
> > 
> > Unless I did something odd during the pull?
> 
> The problem was caused by two commits which got rebased in the VFS 
> tree:
> 
> Commit 1:
> 
>   ee3283c608df ("timekeeping: Add interfaces for handling timestamps with a floor value")
> 
>   commit ee3283c608dfa21251b0821d7bb198c7ae3189f6
>   Author:     Jeff Layton <jlayton@...nel.org>
>   AuthorDate: Wed Oct 2 17:27:16 2024 -0400
>   Commit:     Christian Brauner <brauner@...nel.org>
>   CommitDate: Thu Oct 10 10:20:46 2024 +0200
>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> Which is a rebase of Thomas's original commit:
> 
>   70c8fd00a9bd ("timekeeping: Add interfaces for handling timestamps with a floor value")
> 
>   commit 70c8fd00a9bd0509bbf7bccd9baea8bbd5ddc756
>   Author:     Jeff Layton <jlayton@...nel.org>
>   AuthorDate: Wed Oct 2 17:27:16 2024 -0400
>   Commit:     Thomas Gleixner <tglx@...utronix.de>
>   CommitDate: Sun Oct 6 20:56:07 2024 +0200
> 
> And commit 2:
> 
>   2a15385742c6 ("timekeeping: Add percpu counter for tracking floor swap events")
> 
>   commit 2a15385742c689a271345dcbb4c28b9c568bc7ce
>   Author:     Jeff Layton <jlayton@...nel.org>
>   AuthorDate: Wed Oct 2 17:27:17 2024 -0400
>   Commit:     Christian Brauner <brauner@...nel.org>
>   CommitDate: Thu Oct 10 10:20:46 2024 +0200
>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> Which is a rebase of Thomas's original commit:
> 
>   96f9a366ec8a timekeeping: Add percpu counter for tracking floor swap events
> 
>   commit 96f9a366ec8abe027326d7aab84d64370019f0f1 (tag: timers-core-for-vfs)
>   Author:     Jeff Layton <jlayton@...nel.org>
>   AuthorDate: Wed Oct 2 17:27:17 2024 -0400
>   Commit:     Thomas Gleixner <tglx@...utronix.de>
>   CommitDate: Sun Oct 6 20:56:07 2024 +0200

I was just looking through my reflog and I realised that I did a rebase
onto v6.12-rc2 (v6.12-rc1 had a horribly virtqueue bug that made testing
in a vm a giant pain). Sorry about that I should've noticed that
earlier.

Though I'm confused why -next didn't catch this. When that happens -next
usually reports duplicate commits. Hm... Did I miss the report?

9fed2c0f2f07 (HEAD -> vfs.mgtime, tag: vfs-6.13.mgtime, origin-all/vfs.mgtime) HEAD@{0}: am: fs: reduce pointer chasing in is_mgtime() test
b40508ca5d5c HEAD@{1}: rebase (finish): returning to refs/heads/vfs.mgtime
b40508ca5d5c HEAD@{2}: rebase (reset): 'onto': Merge patch series "timekeeping/fs: multigrain timestamp redux"
d7c898a73f87 HEAD@{3}: rebase (reset): 'onto': Merge tag 'timers-core-for-vfs' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tip/tip into vfs.mgtime
8cf0b93919e1 (tag: v6.12-rc2, master.v6.12-rc2) HEAD@{4}: rebase (reset): 'onto'