public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Thomas Gleixner <tglx@linutronix.de>,
	Christian Brauner <brauner@kernel.org>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org
Subject: Re: [GIT pull] timers/core for v6.13-rc1
Date: Tue, 19 Nov 2024 16:33:45 -0800	[thread overview]
Message-ID: <CAHk-=wiX7=bqOEO06+BsO_25dHoa=KBWcNzLg=-rAKJ=dqKxYg@mail.gmail.com> (raw)
In-Reply-To: <173195758632.1896928.11371209657780930206.tglx@xen13>

On Mon, 18 Nov 2024 at 11:22, Thomas Gleixner <tglx@linutronix.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.

Oh well.

                 Linus

  reply	other threads:[~2024-11-20  0:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-18 19:21 [GIT pull] core/debugobjects for v6.13-rc1 Thomas Gleixner
2024-11-18 19:21 ` [GIT pull] irq/core " Thomas Gleixner
2024-11-20  0:49   ` pr-tracker-bot
2024-11-18 19:21 ` [GIT pull] timers/core " Thomas Gleixner
2024-11-20  0:33   ` Linus Torvalds [this message]
2024-11-20  9:40     ` Borislav Petkov
2024-11-20 10:18     ` Christian Brauner
2024-11-20  0:49   ` pr-tracker-bot
2024-11-18 19:22 ` [GIT pull] timers/vdso " Thomas Gleixner
2024-11-20  0:49   ` pr-tracker-bot
2024-11-20  0:49 ` [GIT pull] core/debugobjects " pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAHk-=wiX7=bqOEO06+BsO_25dHoa=KBWcNzLg=-rAKJ=dqKxYg@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=brauner@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox