From: Thierry Reding <thierry.reding@kernel.org>
To: David Heidelberg <david@ixit.cz>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: omission of the nfc tree
Date: Mon, 04 May 2026 22:50:10 +0200 [thread overview]
Message-ID: <e06a424df9659ec00dc929be6f50ac51@kernel.org> (raw)
Hi all,
Today's linux-next merge of the nfc tree got a conflict in a bunch of
files. It looks like you based this tree on next-20260430 and this
causes a bunch of old trees being pulled into today's linux next and
that results in a lot of conflicts.
Your for-next branch should always be based on -rc1 or some later -rc
if there's a need. It should *never* be based on a previous linux-next
build.
I'm omitting the nfc tree today. Please fix this so that the tree can
be included in linux-next.
Thanks,
Thierry
next reply other threads:[~2026-05-04 20:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 20:50 Thierry Reding [this message]
2026-05-05 9:47 ` linux-next: omission of the nfc tree David Heidelberg
2026-05-05 13:57 ` Thierry Reding
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=e06a424df9659ec00dc929be6f50ac51@kernel.org \
--to=thierry.reding@kernel.org \
--cc=david@ixit.cz \
--cc=linux-kernel@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