linux-next: omission of the nfc tree

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

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

David Heidelberg

-rc2 is fine, too. Anything from Linus' tree should be fine, really, since Linus' tree is the base for linux-next.

The idea is that you should pull in only as much as necessary to reduce dependencies and complexity. If you need to pull in some other tree (to satisfy a dependency, for example, always make sure to work with the corresponding maintainer to ensure they keep the branch that you pull in stable (i.e. don't rebase it), otherwise things will get ugly and we start pulling multiple versions of the same commits, etc.

Thierry

Linus tends to prefer that it's a tag rather than a random commit from his tree, but otherwise as Thierry says anything from his tree should be fine (and a random commit is almost certainly fine in practice anyway).