public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: Patrick Steinhardt <ps@pks.im>,
	 git@vger.kernel.org,
	 "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH 2/3] contrib/contacts: rename .txt to .adoc
Date: Fri, 28 Feb 2025 10:47:27 -0800	[thread overview]
Message-ID: <xmqq1pvh3o00.fsf@gitster.g> (raw)
In-Reply-To: <Z8HAv5I1hoNiQYoa@teonanacatl.net> (Todd Zullinger's message of "Fri, 28 Feb 2025 08:57:19 -0500")

Todd Zullinger <tmz@pobox.com> writes:

> Since this is only in next and the first patch of the series
> targets a "breakage" in 2.49.0-rc0, should I split the
> latter commits into a separate series based on next or is
> ef18273a2d9 likely to be merged into master before 2.49.0?

ef18273a (Merge branch 'ps/meson-contrib-bits' into next,
2025-02-27) WILL NEVER be merged into master in any timeframe.
Doing so will pull all the other merge commits on 'next' into
'master'.

According to tinyurl.com/gitcal, we plan to tag -rc1 on Mar 4th and
-rc2 on Mar 10th.  The topic ps/meson-contrib-bits will have spent 7
calendar days in 'next' before we tag -rc2, so unless people find
issues with the topic while in 'next', it is expected to land before
the 10th.

Creating a merge of ps/meson-contrib-bits topic into the 'master'
(you do this yourself locally), and building your series on that
merge commit (and you send these patches to the list, saying that
they are based on such a merge in the cover letter) would be the
most appropriate in this case, I think.

Thanks.



  reply	other threads:[~2025-02-28 18:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-28  3:47 [PATCH 0/3] doc: txt -> adoc fixes Todd Zullinger
2025-02-28  3:47 ` [PATCH 1/3] doc: update howto-index.sh for .adoc extensions Todd Zullinger
2025-02-28 13:55   ` Junio C Hamano
2025-02-28  3:47 ` [PATCH 2/3] contrib/contacts: rename .txt to .adoc Todd Zullinger
2025-02-28  8:13   ` Patrick Steinhardt
2025-02-28 13:57     ` Todd Zullinger
2025-02-28 18:47       ` Junio C Hamano [this message]
2025-03-01 15:34         ` Todd Zullinger
2025-02-28  3:47 ` [PATCH 3/3] contrib/subtree: " Todd Zullinger
2025-02-28  8:13   ` Patrick Steinhardt
2025-02-28 13:50     ` Todd Zullinger
2025-02-28 14:09       ` Patrick Steinhardt
2025-02-28 18:34         ` Junio C Hamano
2025-02-28 13:45 ` [PATCH 0/3] doc: txt -> adoc fixes Junio C Hamano
2025-03-01 15:36 ` [PATCH v2 " Todd Zullinger
2025-03-01 15:36   ` [PATCH v2 1/3] doc: update howto-index.sh for .adoc extensions Todd Zullinger
2025-03-01 15:36   ` [PATCH v2 2/3] contrib/contacts: rename .txt to .adoc Todd Zullinger
2025-03-01 15:36   ` [PATCH v2 3/3] contrib/subtree: " Todd Zullinger
2025-03-01 18:02   ` [PATCH v2 0/3] doc: txt -> adoc fixes Junio C Hamano
2025-03-01 18:20   ` Junio C Hamano
2025-03-01 18:25     ` [PATCH v2 4/3] doc: fix build-docdep.perl Junio C Hamano
2025-03-01 19:41       ` Todd Zullinger

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=xmqq1pvh3o00.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ps@pks.im \
    --cc=sandals@crustytoothpaste.net \
    --cc=tmz@pobox.com \
    /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