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=-2.2 required=3.0 tests=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 002B8C432C0 for ; Mon, 18 Nov 2019 17:29:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C959F208CD for ; Mon, 18 Nov 2019 17:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726809AbfKRR33 (ORCPT ); Mon, 18 Nov 2019 12:29:29 -0500 Received: from smtp1.de.adit-jv.com ([93.241.18.167]:45222 "EHLO smtp1.de.adit-jv.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726427AbfKRR32 (ORCPT ); Mon, 18 Nov 2019 12:29:28 -0500 Received: from localhost (smtp1.de.adit-jv.com [127.0.0.1]) by smtp1.de.adit-jv.com (Postfix) with ESMTP id 9987C3C04C0; Mon, 18 Nov 2019 18:29:26 +0100 (CET) Received: from smtp1.de.adit-jv.com ([127.0.0.1]) by localhost (smtp1.de.adit-jv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5HHeYgedQuYc; Mon, 18 Nov 2019 18:29:21 +0100 (CET) Received: from HI2EXCH01.adit-jv.com (hi2exch01.adit-jv.com [10.72.92.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp1.de.adit-jv.com (Postfix) with ESMTPS id 0C1DC3C0022; Mon, 18 Nov 2019 18:29:21 +0100 (CET) Received: from vmlxhi-102.adit-jv.com (10.72.93.184) by HI2EXCH01.adit-jv.com (10.72.92.24) with Microsoft SMTP Server (TLS) id 14.3.468.0; Mon, 18 Nov 2019 18:29:20 +0100 Date: Mon, 18 Nov 2019 18:29:17 +0100 From: Eugeniu Rosca To: CC: , Greg KH , Felipe Balbi , Eugeniu Rosca , Eugeniu Rosca Subject: Signal conflict on merging metadata-differing patches Message-ID: <20191118172917.GA6063@vmlxhi-102.adit-jv.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.12.1+40 (7f8642d4ee82) (2019-06-28) X-Originating-IP: [10.72.93.184] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dear Git community, Due to high inflow of patches which Linux maintainers carry on their shoulders and due to occasionally intricate relationships between consecutive revisions of the same series, it may [1] happen that two distinct revisions of the same patch (differing only/mostly in metadata, e.g. Author's time-stamp and commit description) may end up being merged on the same branch, without git to complain about that. Is there any "git merge" flag available off-the-shelf which (if used) would signal such situations? [1] https://patchwork.kernel.org/patch/11135107/#23007101 -- Best Regards, Eugeniu