From patchwork Wed Mar 9 11:46:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ander Conselvan de Oliveira X-Patchwork-Id: 8545761 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6FB1CC0553 for ; Wed, 9 Mar 2016 11:46:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9910020254 for ; Wed, 9 Mar 2016 11:46:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 89C2220114 for ; Wed, 9 Mar 2016 11:46:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E543B6E168; Wed, 9 Mar 2016 11:46:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 18FF46E168 for ; Wed, 9 Mar 2016 11:46:44 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 09 Mar 2016 03:46:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,311,1455004800"; d="scan'208";a="905939907" Received: from linux.intel.com ([10.23.219.25]) by orsmga001.jf.intel.com with ESMTP; 09 Mar 2016 03:46:43 -0800 Received: from localhost (aconselv-mobl3.ger.corp.intel.com [10.237.72.53]) by linux.intel.com (Postfix) with ESMTP id D616E2C8001; Wed, 9 Mar 2016 04:34:29 -0800 (PST) From: Ander Conselvan de Oliveira To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Mar 2016 13:46:25 +0200 Message-Id: <1457523985-6261-1-git-send-email-ander.conselvan.de.oliveira@intel.com> X-Mailer: git-send-email 2.4.3 Cc: Ander Conselvan de Oliveira Subject: [Intel-gfx] [maintainer-tools PATCH] drm-intel: Add note about patches that move code between files X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patches that move big chunks of code between files can cause some complicated conflicts. Add a note to coordinate with maintainers before merging such patches. Signed-off-by: Ander Conselvan de Oliveira --- drm-intel.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drm-intel.rst b/drm-intel.rst index c0c2f20..89df24b 100644 --- a/drm-intel.rst +++ b/drm-intel.rst @@ -350,6 +350,10 @@ An inexhaustive list of details to check: http://developercertificate.org/. dim apply-branch should do this automatically for you. +* For patches that move around lots of code (file rename or extraction) please + coordinate with maintainers to avoid unnecessary pain with conflicts. Usually + some explicit merges are needed to avoid git getting lost. + On Confidence, Complexity, and Transparency -------------------------------------------