* linux-next: omission of the nfc tree
@ 2026-05-04 20:50 Thierry Reding
2026-05-05 9:47 ` David Heidelberg
0 siblings, 1 reply; 2+ messages in thread
From: Thierry Reding @ 2026-05-04 20:50 UTC (permalink / raw)
To: David Heidelberg; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: omission of the nfc tree
2026-05-04 20:50 linux-next: omission of the nfc tree Thierry Reding
@ 2026-05-05 9:47 ` David Heidelberg
0 siblings, 0 replies; 2+ messages in thread
From: David Heidelberg @ 2026-05-05 9:47 UTC (permalink / raw)
To: Thierry Reding; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
Hello Thierry,
sorry about that, should be fixed (rebased against -rc2 now).
Is there strong insensitive to use -rc1? In case it causing additional work, I
can stick with rc1.
David
On 04/05/2026 22:50, Thierry Reding wrote:
> 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
--
David Heidelberg
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-05 9:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-04 20:50 linux-next: omission of the nfc tree Thierry Reding
2026-05-05 9:47 ` David Heidelberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox