From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDWv8-0001Jy-2Y for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:01:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDWv5-0001RL-6K for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:01:17 -0400 Received: from mail-vk0-x22a.google.com ([2607:f8b0:400c:c05::22a]:34835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDWv4-0001RG-Jf for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:01:15 -0400 Received: by mail-vk0-x22a.google.com with SMTP id j2so71924758vkg.2 for ; Thu, 16 Jun 2016 06:01:14 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1466066426-16657-1-git-send-email-berrange@redhat.com> References: <1466066426-16657-1-git-send-email-berrange@redhat.com> From: Peter Maydell Date: Thu, 16 Jun 2016 14:00:54 +0100 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: QEMU Developers , Stefan Hajnoczi , Eric Blake , =?UTF-8?Q?Llu=C3=ADs_Vilanova?= , Gerd Hoffmann On 16 June 2016 at 09:39, Daniel P. Berrange wrote: > This series splits up trace-events so that there is > one trace-events file per sub-directory that has > tracing events defined. This means that the trace-events > files now get assoociated with the subsystem maintainers > if you run get_maintainer.pl on a patch. It also means > that responsibility for resolving conflicts is now > delegated to subsystem maintainers, and overall such > conflicts should be much rarer. Do you have a command line rune to sanity check that the split files have identical content to the old single file? That would be handy when it comes to merging this into master to check that any conflicts got resolved correctly. thanks -- PMM