* linux-next: Extensive merge conflicts in the turbostat tree
@ 2026-11-02 16:36 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2026-11-02 16:36 UTC (permalink / raw)
To: Len Brown; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi all,
The turbostat tree today has extensive merge conflicts with Linus' tree.
Looking at the history it appears that there has been a divergent rebase
at some point, there are a substantial number of duplicated commits
between the two with things built on top in both branches. The
turbostat tee does not contain the power-utilities-2026.10.31 tag that
Linus merged on Saturday. This looks unintentional and is creating an
enormous and likely error prone mess, given this I have not merged the
turbostat tree today.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-02 16:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-02 16:36 linux-next: Extensive merge conflicts in the turbostat tree Mark Brown
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®