Skip to content

docs: #58, #60 and #61 merged upstream — and what that does not yet mean - #62

Merged
prakashrj merged 1 commit into
mainfrom
docs/upstream-58-60-61-merged
Aug 31, 2026
Merged

prakashrj merged 1 commit into
mainfrom
docs/upstream-58-60-61-merged

Conversation

@prakashrj

Copy link
Copy Markdown
Contributor

libtailscale merged three on 2026-08-31:

commit PR retires
8564835 #60 — gate the listener API 0003-gate-listener-api.patch
61e8513 #58 — run tailscale_up off the actor 0002-up-off-actor.patch
59d4bb8 #61 — MACOS_TARGET ?= never carried here

The important part is what has not changed

All three sit ahead of the commit vendor/libtailscale pins (5e89501):

59d4bb8  #61
61e8513  #58
8564835  #60
8077131
5e89501  ← we are here

So this repo still applies 0002 and 0003, and will keep doing so until the submodule is bumped. Recording them as simply "merged" would imply the patches are gone — exactly the claim this section already refuses to make for tailscale#20985, which is merged upstream and carried by no release.

Each entry now says three things instead of one: it merged, which commit, and that the pin predates it. The delete-do-not-rebase instruction is kept and made conditional on the bump, because that's the moment it becomes actionable.

Unchanged

Also

Refreshes the "states verified" date and extends its caveat: whether a fix has shipped was already distinguished from whether it merged; now so is whether it has reached this repo's pinned submodule.

Docs only.

libtailscale merged three on 2026-08-31:

  8564835  #60  gate the listener API           -> retires 0003
  61e8513  #58  run tailscale_up off the actor  -> retires 0002
  59d4bb8  #61  MACOS_TARGET ?= 15.0            -> never carried here

The important part is what has NOT changed. All three sit *ahead of* the commit
`vendor/libtailscale` pins (5e89501), so this repo still applies 0002 and 0003
and will keep doing so until the submodule is bumped. Recording them as simply
"merged" would imply the patches are gone, which is exactly the kind of claim
this section already refuses to make for tailscale#20985 — merged there too, and
carried by no release.

So each entry now says three things rather than one: it merged, which commit,
and that the pin predates it. The delete-do-not-rebase instruction is kept and
made conditional on the bump, because that is the moment it becomes actionable.

#57 remains open with changes requested and still gates v0.2. #59 remains open
and is still not on the critical path.

Also refreshes the "states verified" date and extends its caveat: whether a fix
has *shipped* was already distinguished from whether it merged, and now so is
whether it has reached this repo's pinned submodule.

Co-Authored-By: Claude <noreply@anthropic.com>
@prakashrj
prakashrj merged commit c633a29 into main Aug 31, 2026
12 checks passed
@prakashrj
prakashrj deleted the docs/upstream-58-60-61-merged branch August 31, 2026 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant