Re: Dup commits in NFC trees [Was: Time to call it quits for the maintainer summit?]

On 11/08/2026 15:17, Mark Brown wrote:
> On Tue, Aug 11, 2026 at 10:12:40AM +0200, Matthieu Baerts wrote:
>> On 11/08/2026 00:47, Mark Brown wrote:
> 
>>> For some numbers on the cherry picking: I'm currently seeing 111 dups in
>>> drm (we also have 6 more in subtrees), out of 1739 total non-merge
>>> commits.  That's about 6% which seems like a lot, and they generate
>>> almost all of the frequent conflicts that DRM generates.  Next on the
>>> list is nfc with 17/35 which is a much larger percentage, and all of the
>>> 8 commits in the hyperv-fixes tree are duplicates.
> 
>> I'm not sure whether you have been aware of this, but NFC has a new
>> maintainer: David [1]. I see that the new tree is listed in linux-next.
> 
> Yes, and he's the contact for those trees.
> 
>> Maybe David doesn't know he is not supposed to cherry-pick commits
>> between his "for-linus" and "for-next" branches, but he should merge
>> "for-linux" into "for-next" instead.
> 
> Or just not merge them, or wait for Linus to merge things and merge
> Linus' tags (that means you also get other bugfixes which can help
> people with platform support).  TBH I've not looked at what nfc is doing
> since it doesn't really cause any problems for me - I can only see one
> conflict I've noticed in the tree and that doesn't look like it was the
> result of cherry picking.  I only saw the duplication due to generating
> a report.  We don't seem to have ended up with any duplication in
> mainline either from a quick check.
> 
> IOW it's possible whatever's going on is something that actually works
> fine and only results in transient duplications.

Hello Matthieu and Mark.

Sorry bout that, the nfc-next and nfc-linus will not going to have any 
duplication in future (at least intended duplication).

David

-- 
David Heidelberg