mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Hans Verkuil <hverkuil@kernel.org>,
	Ricardo Ribalda <ribalda@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linux Media Mailing List <linux-media@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL for v7.4] media updates
Date: Sat, 31 Oct 2026 22:25:23 -0400	[thread overview]
Message-ID: <20261101022524.1005227-1-sashal@kernel.org> (raw)
In-Reply-To: <CAHk-=wixKLm5ahcYJ0tZNViP298RNJ_QwDcXN-AheH6uOfLZwA@mail.gmail.com>

On Sat, Oct 31, 2026 at 02:14:37PM -0700, Linus Torvalds wrote:
> It actually broke git this merge window. See
>
>    https://lore.kernel.org/all/20261031065525.19883-2-torvalds@kernel.org/

I was curious which 283 commits describe was overcounting. Funny
enough, they all come from bpf-next-7.3 rather than media, and their
dates seem to make sense.

A bpf series went in with five commits in the same second. A bpf-next-7.4
series without a base-commit then got applied on top of the middle of that run:

  bd2466ed8fc2 ("bpf: Roll back stream capacity when allocation fails")

sits on

  af22d273aa1f ("bpf, arm64: Fix exception table metadata for arena load-acquire")

The media dates seem to come from tooling too: The media CI merges MRs with
Marge-bot, a GitLab merge bot, which rebases each one onto next using
--keep-committers [1]. That copies the original committer date onto every
rebased commit, so an MR landing after a newer one ends up older than its new
parent.

GitLab shows the same pattern for all the commits you found: the copy each
committer pushed sits on an older parent with the same committer date, and the
rebased branch that landed was pushed by marge-bot. For your example, Sakari
pushed the alvium fix on top of

  b38d06ad1e13 ("media: ipu6: Fix up missing IWYU issue")

His MR with

  63c578491cb4 ("media: sun6i-csi: bridge: Use V4L2 subdev active state")

merged at 22:10 UTC on Sep 16, and at 22:11 marge-bot pushed the alvium
MR rebased on top of it, still dated Sep 15.

So in both cases it's the tooling being funny.

[1] https://gitlab.com/marge-org/marge-bot/-/commit/3fb8ab74b8781505530c21a28ac08080bc7deedb

-- 
Thanks,
Sasha

  reply	other threads:[~2026-11-01  2:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-24 16:50 Mauro Carvalho Chehab
2026-10-25  5:51 ` pr-tracker-bot
2026-10-26 17:34 ` Linus Torvalds
2026-10-26 18:24   ` Sakari Ailus
2026-10-26 18:53     ` Linus Torvalds
2026-10-26 23:56       ` Mauro Carvalho Chehab
2026-10-27  0:04         ` Mauro Carvalho Chehab
2026-10-27  7:37         ` Laurent Pinchart
2026-10-27  8:01           ` Mauro Carvalho Chehab
2026-10-27 10:09       ` [PATCH 1/1] Revert "media: Don't hide I²C or SPI drivers by default" Sakari Ailus
2026-10-27 10:19         ` Laurent Pinchart
2026-10-27 11:03           ` Sakari Ailus
2026-10-26 19:13     ` [GIT PULL for v7.4] media updates Laurent Pinchart
2026-10-31  7:47   ` Linus Torvalds
2026-10-31 21:14     ` Linus Torvalds
2026-11-01  2:25       ` Sasha Levin [this message]
2026-11-01  7:45       ` Mauro Carvalho Chehab
2026-11-01 17:05         ` Linus Torvalds
2026-10-28  0:40 Mauro Carvalho Chehab
2026-10-28 18:10 ` 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=20261101022524.1005227-1-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hverkuil@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab+huawei@kernel.org \
    --cc=ribalda@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=torvalds@linux-foundation.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

all inboxes | Powered by JetHome®