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=-7.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 6094BC2B9F4 for ; Tue, 22 Jun 2021 06:23:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4450B6113E for ; Tue, 22 Jun 2021 06:23:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229904AbhFVGZs (ORCPT ); Tue, 22 Jun 2021 02:25:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46234 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229702AbhFVGZp (ORCPT ); Tue, 22 Jun 2021 02:25:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624343009; 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=aQqfkvCtBb6g17+HqN0uwZioUK6+vGsvOXTdTvz9LIc=; b=fZbAp+kY9Oq/YcndHYZ02y2K9/mDYZvIsJ1pA++0V7SNbrwRzWWf3De51W4uTxu7IbGfQn awtaSu6T8DEMJs6H8CYaJP4jjIm6p0iRe8FYbVtjEDNiy55g/qPya7r6sbQGQXl7FfRiLD kQmN9PanN+ampm7TuUyBSOrm6XiVArA= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-482-C6QwW_PGN6K_vAxv8Pwf6Q-1; Tue, 22 Jun 2021 02:23:28 -0400 X-MC-Unique: C6QwW_PGN6K_vAxv8Pwf6Q-1 Received: by mail-wr1-f70.google.com with SMTP id p2-20020a5d63820000b029011a9ecaf55dso137994wru.19 for ; Mon, 21 Jun 2021 23:23:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=aQqfkvCtBb6g17+HqN0uwZioUK6+vGsvOXTdTvz9LIc=; b=Y8CA3+vcJW4Vt7TEoZjOYFa3CiOuIvUnWD9sG3QAtGfz1w78tbZbxbwpf61qsVYP2h vaoqZDZgoITRyss1PV25jnewVCszxL4BDkS7tYxt941Hlfl4vLvzeDyiU1yO4bgN0aps woKlfFb+/Nw5G720FyiL1Ty2qgpfFZYMTOfDmAZUVk6jCTbPwkMmsszW+l2PJGXrjKra 6h8qbm2zWPU+65n1V6ifGrEAKTzB10hUhoGg+kBKyBYlJHg+EarqmLCG4TMzJIB3LrjQ bB0xH7mIVbPKvXdv//bpbbn4OX3889cjvn3isTf+PvB2yw7UTb05niM7zrZuq9OMYsxL e8iA== X-Gm-Message-State: AOAM532cbzxKeudoh2gSf6feq9Vl5XYm6GZy9c6Ug/XiMujw96UGHWCT QisWcVT8AEToMlNYC05PkCyOWdXileB6EONBHxUe0l7IYpIHd2AoEHIV3p1PfINMwE4nXf20va4 Pijt+Fwr1PfmtlpxmwPq/fS2d X-Received: by 2002:a5d:44d2:: with SMTP id z18mr2678879wrr.358.1624343006180; Mon, 21 Jun 2021 23:23:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH/4w8wmlBb+QUv5p9+m3hdd4Lh4ZTIRS504JjrKAX2ybZM9tGHk+qPRypejrUSPVJj6nMOg== X-Received: by 2002:a5d:44d2:: with SMTP id z18mr2678861wrr.358.1624343006005; Mon, 21 Jun 2021 23:23:26 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a1sm26072095wra.63.2021.06.21.23.23.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Jun 2021 23:23:25 -0700 (PDT) Subject: Re: linux-next: manual merge of the kvm tree with the powerpc tree To: Stephen Rothwell , KVM , Michael Ellerman , PowerPC Cc: Ashish Kalra , Bharata B Rao , Brijesh Singh , Linux Kernel Mailing List , Linux Next Mailing List , Maxim Levitsky , Sean Christopherson , Vitaly Kuznetsov References: <20210622152544.74e01567@canb.auug.org.au> From: Paolo Bonzini Message-ID: <9c2dbe56-4c64-0032-0acb-2e2925c7a2ab@redhat.com> Date: Tue, 22 Jun 2021 08:23:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210622152544.74e01567@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/06/21 07:25, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > include/uapi/linux/kvm.h > > between commit: > > 9bb4a6f38fd4 ("KVM: PPC: Book3S HV: Add KVM_CAP_PPC_RPT_INVALIDATE capability") > > from the powerpc tree and commits: > > 644f706719f0 ("KVM: x86: hyper-v: Introduce KVM_CAP_HYPERV_ENFORCE_CPUID") > 6dba94035203 ("KVM: x86: Introduce KVM_GET_SREGS2 / KVM_SET_SREGS2") > 0dbb11230437 ("KVM: X86: Introduce KVM_HC_MAP_GPA_RANGE hypercall") > > from the kvm tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > What are the dependencies of these KVM patches on patches from the bare metal trees, and can you guys *please* start using topic branches? I've been asking you for literally years, but this is the first time I remember that Linus will have to resolve conflicts in uAPI changes and it is *not* acceptable. Please drop the patches at https://www.spinics.net/lists/kvm-ppc/msg18666.html from the powerpc tree, and merge them through either the kvm-powerpc or kvm trees. Paolo