From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE814C6369E for ; Wed, 2 Dec 2020 23:44:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58627221EB for ; Wed, 2 Dec 2020 23:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729242AbgLBXoe (ORCPT ); Wed, 2 Dec 2020 18:44:34 -0500 Received: from mx2.suse.de ([195.135.220.15]:37022 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726188AbgLBXoe (ORCPT ); Wed, 2 Dec 2020 18:44:34 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E9B8EAB63; Wed, 2 Dec 2020 23:43:52 +0000 (UTC) From: Vlastimil Babka To: "ksummit-discuss@lists.linuxfoundation.org" Cc: LKML Subject: crediting bug reports and fixes folded into original patch Message-ID: Date: Thu, 3 Dec 2020 00:43:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, there was a bit of debate on Twitter about this, so I thought I would bring it here. Imagine a scenario where patch sits as a commit in -next and there's a bug report or fix, possibly by a bot or with some static analysis. The maintainer decides to fold it into the original patch, which makes sense for e.g. bisectability. But there seem to be no clear rules about attribution in this case, which looks like there should be, probably in Documentation/maintainer/modifying-patches.rst The original bug fix might include a From: $author, a Reported-by: (e.g. syzbot), Fixes: $next-commit, some tag such as Addresses-Coverity: to credit the static analysis tool, and an SoB. After folding, all that's left might be a line as "include fix from $author" in the SoB area. This is a loss of metadata/attribution just due to folding, and might make contributors unhappy. Had they sent the fix after the original commit was mainline and immutable, all the info above would "survive" in the form of new commit. So I think we could decide what the proper format would be, and document it properly. I personally wouldn't mind just copy/pasting the whole commit message of the fix (with just a short issue description, no need to include stacktraces etc if the fix is folded), we could just standardize where, and how to delimit it from the main commit message. If it's a report (person or bot) of a bug that the main author then fixed, preserve the Reported-by in the same way (making clear it's not a Reported-By for the "main thing" addressed by the commit). In the debate one less verbose alternatve proposed was a SoB with comment describing it's for a fix and not whole patch, as some see SoB as the main mark of contribution, that can be easily found and counted etc. I'm not so sure about it myself, as AFAIK SoB is mainly a DCO thing, and for a maintainer it means something else ("passed through my tree") than for a patch author. And this approach would still lose the other tags. Thoughts? Vlastimil