From nobody Wed May 1 15:08:33 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1558661927; cv=none; d=zoho.com; s=zohoarc; b=gpMqxISW6cziKplKQMrcEV5uoWv+VOTp/hZw9Q9IZ7Gcs6JMz8lVp82lbhXmM++5UBWiTWE5dYP0CrDBsopqoZARLxZxuGtQm+ltZaIUVZ+bqSkwuQ8JQv64WYGgGODo8qVHSqvu0T4EoziC+w1SnjgOE49aYWGld/vPQR6WNSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558661927; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=s16grkREALc3aiVtBMBlg0zRTcyYYQnZA5h/LDud4gU=; b=e/QUnz9GHdZtI65NbdRzKH3AuebR5zJHpX0aI0sEU0zvrWAjltRtB0HQ2elkVCBEftio1bNKAub+ZSwgCot/3B6QJnYxn+Di1VPVTZYPxz6WRE5aPXxyopc9fAXdwVtdro3JZx8q60h+hn9+fZM1NizOe5OP8ODmhGBwZ0K72pE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1558661926953487.45922491809176; Thu, 23 May 2019 18:38:46 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTz8q-0008Oy-Lp; Fri, 24 May 2019 01:37:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTz8o-0008Ot-SU for xen-devel@lists.xenproject.org; Fri, 24 May 2019 01:37:02 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6ad2d894-7dc4-11e9-8e95-0b30b468877f; Fri, 24 May 2019 01:36:57 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTz8c-0006S7-DV; Fri, 24 May 2019 01:36:50 +0000 Received: from localhost ([127.0.0.1] helo=localhost.localdomain) by xenbits.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTz8c-0006pF-4y; Fri, 24 May 2019 01:36:50 +0000 X-Inumbo-ID: 6ad2d894-7dc4-11e9-8e95-0b30b468877f From: Lars Kurth To: xen-devel@lists.xenproject.org Date: Thu, 23 May 2019 19:36:24 -0600 Message-Id: <04e56f911ff972acb4a0135da043f65b714a44ee.1558661458.git.lars.kurth@citrix.com> X-Mailer: git-send-email 2.13.0 Subject: [Xen-devel] [PATCH v2] Add TRACKING.IMPORTS to xen.git to more easily manage imported files that need to be kept in sync with an upstream X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Lars Kurth , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , committers@xenproject.org, Jan Beulich MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Following the recent discussion, we had on IRC and the action I had in=20 the March community call, this file provides a file format that=20 enables writing an automated test to check whether files are out of sync.=20 Once the file format is agree, I will write a test or script. I also need some more correct test data, aka entries in the file from committers looking after the following files [Jan] xen/arch/x86/cpu/mwait-idle.c=20 [Stefano, Julien - this has to be finalized] xen/drivers/passthrough/arm/smmu.c xen/arch/arm/vgic/* xen/include/asm-arm/div64.h xen/drivers/char/meson-uart.c xen/arch/arm/arm32/lib/* xen/arch/arm/arm64/lib/* xen/arch/arm/arm64/cache.S xen/arch/arm/arm64/bpi.S xen/include/asm-arm/system.h xen/arch/arm/arm64/insn.c [Others?] xen/common/rbtree.c Note that in some cases Linux has diverged and some Linux files have disapp= eared.=20 Julien also raised the point, that in some cases only a subset of code from= Linux Xen files was applied or that only some functions get moved across t= o Xen. I believe that is entirely OK. The workflow would be in most cases that: - We use a Linux (source) commit as a benchmark and record the commit ID - If there is a change in Linux the test will fail - The committer looks at the diff and either - Decides to ignore it and bumps the commit ID in this file - Decides the change is needed, integrates it into Xen and then=20 bumps the commit ID in this file Changes since v1 * Require a colon after repo:, file:, ... keywords * Replace manual:|auto: with file: as there auto: use-case was invalid * Added more verbose description of format Signed-off-by: Lars Kurth CC: committers@xenproject.org --- TRACKING.FILES | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 TRACKING.FILES diff --git a/TRACKING.FILES b/TRACKING.FILES new file mode 100644 index 0000000000..3afb468ed7 --- /dev/null +++ b/TRACKING.FILES @@ -0,0 +1,50 @@ +# This file contains information about source files that have been +# copied from other sources and need to be tracked +# +# The file may contain lines starting with ... +# -------------------------------------------- +# version: of file format +# repo: repository definition +# file: a mapping to track files +# +# Note that repo: entries must come *before* file: entries +# +# Repository Definitions are of the following format +# -------------------------------------------------- +# repo: name-of-source-repo git|svn https-url-of-source-repo +# +# name-of-source-repo: +# Name of source repository. The name will be used as reference in file: +# statements +# +# git|svn: +# Type ofsource repository +# +# https-url-of-source-repo: +# URL of source repository +# +# For example: +# repo: linux-torvalds git https://git.kernel.org/pub/scm/linux/kernel/g= it/torvalds/linux.git +# +# Mappings to track files are of the following format +# --------------------------------------------------- +# file: xen-file name-of-original-repo original-file commit-id +# +# xen-file: +# Xen file that needs to be tracked +# +# name-of-original-repo: +# A reference to a source repository defined by *repo* keyword +# +# original-file: +# File in original-repo from which we regularly want to merge changes +# into xen-file +# +# commit id: +# Last commit id of original-file that was deemed to be ok +# and either imported into the tree or rejected +# +# For example: +# file: xen/drivers/passthrough/arm/smmu.c linux-torvalds linux/drivers/= iommu/arm-smmu.c b77cf11f094136 + +version: 1 --=20 2.13.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel