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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 34FABC388F7 for ; Wed, 28 Oct 2020 08:13:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A97424196 for ; Wed, 28 Oct 2020 08:13:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YN0urbfD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A97424196 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXgaF-0005rd-8r for qemu-devel@archiver.kernel.org; Wed, 28 Oct 2020 04:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXgZA-0005QL-UT for qemu-devel@nongnu.org; Wed, 28 Oct 2020 04:12:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kXgZ8-00080z-BV for qemu-devel@nongnu.org; Wed, 28 Oct 2020 04:12:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603872735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8+AYoEp2wwPTzi1ST1tMtYWqjyR356sxS0NZwZibjNs=; b=YN0urbfDELlZlaP6T+P1URFL5Nv/w8m2b4/vgb6IqAVd5vi5ib0Rl6eC+Ajw39o9hHMYC+ VD+Gp0POkoIdBSvTV1uC5LOw5jv8+H9lhAlMFHa9I5IBj6f6QKqO15n+5PcPewqtXuZMFd uJwvGjjObefAnjtTUOEPGu1Ek+a8Xrc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-cvKNDOQRP_mvgPKLln63Gw-1; Wed, 28 Oct 2020 04:12:14 -0400 X-MC-Unique: cvKNDOQRP_mvgPKLln63Gw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06181425EA; Wed, 28 Oct 2020 08:12:12 +0000 (UTC) Received: from gondolin (ovpn-113-192.ams2.redhat.com [10.36.113.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id A203F60C47; Wed, 28 Oct 2020 08:12:01 +0000 (UTC) Date: Wed, 28 Oct 2020 09:11:58 +0100 From: Cornelia Huck To: Peter Maydell Subject: Re: [PULL 00/32] VFIO updates 2020-10-26 (for QEMU 5.2 soft-freeze) Message-ID: <20201028091158.09df8b3c.cohuck@redhat.com> In-Reply-To: References: <160374054442.22414.10832953989449611268.stgit@gimli.home> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/28 01:51:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Artem Polyakov , Zhengui li , Yan Zhao , Zhi Wang , Pierre Morel , Matthew Rosato , QEMU Developers , Shameer Kolothum , Max Reitz , Eric Auger , Alex Williamson , Paolo Bonzini , Kirti Wankhede , Neo Jia , Amey Narkhede , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 27 Oct 2020 23:42:57 +0000 Peter Maydell wrote: > On Mon, 26 Oct 2020 at 19:39, Alex Williamson > wrote: > > ---------------------------------------------------------------- > > VFIO update 2020-10-26 > > > > * Migration support (Kirti Wankhede) > > * s390 DMA limiting (Matthew Rosato) > > * zPCI hardware info (Matthew Rosato) > > * Lock guard (Amey Narkhede) > > * Print fixes (Zhengui li) > > I get a conflict here in > include/standard-headers/linux/fuse.h: > > ++<<<<<<< HEAD > +#define FUSE_ATTR_FLAGS (1 << 27) > ++======= > + #define FUSE_SUBMOUNTS (1 << 27) > ++>>>>>>> remotes/awilliam/tags/vfio-update-20201026.0 > > I assume these should not both be trying to use the same value, > so something has gone wrong somewhere. The conflicting commit > now in master is Max's 97d741cc96dd08 ("linux/fuse.h: Pull in from Linux"). > > Can you sort out the correct resolution between you, please? > (My guess is that Max's commit is the erroneous one because > it doesn't look like it was created via a standard update > from the kernel headers.) We should never change things in the synced headers other than via a headers update (excluding fixups of prior messes.) I'm pointing it out whenever I see something like that happening, but nobody is going to catch all of those. Is there any place where we can have some kind of automatic check on a pull request for that kind of stuff? We'd need to formalize an "update headers" commit message, or maybe have the update script write some kind of "last updated" file?