From: Mark Brown <broonie@kernel.org>
To: Len Brown <lenb@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: Extensive merge conflicts in the turbostat tree
Date: Mon, 2 Nov 2026 16:36:06 +0000 [thread overview]
Message-ID: <aui79mZLqkXYhZzY@sirena.org.uk> (raw)
[-- 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 --]
reply other threads:[~2026-11-02 16:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=aui79mZLqkXYhZzY@sirena.org.uk \
--to=broonie@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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®