linux-next: Extensive merge conflicts in the turbostat tree
From: Mark Brown
Date: Mon Nov 02 2026 - 16:18:05 EST
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:
signature.asc
Description: PGP signature