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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 417AFC433FE for ; Fri, 17 Dec 2021 17:07:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239663AbhLQRHV (ORCPT ); Fri, 17 Dec 2021 12:07:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31847 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236055AbhLQRHU (ORCPT ); Fri, 17 Dec 2021 12:07:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639760839; 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=2+WRMJfHlXftJ9YeoYXvWKoQ/evPaqEvHg4A06Tryvs=; b=g6jzlncyysZwniBw6OvSxPpYehBt7fIKm0NOjpEKa+g5g0nRT4/5jj0rYuSf9Wm+tPHfR6 ZeC8YkF04IJPICKMJByOpByri79iaViy/GAPkqSxLO3Jkk7s/btKTALMftRaqgj8+E8oY7 zRRM0J1sClDS0k4Yr+n5vVQixeYPfmU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-2hZ4aewrOCyBGzp6ioxWpw-1; Fri, 17 Dec 2021 12:07:18 -0500 X-MC-Unique: 2hZ4aewrOCyBGzp6ioxWpw-1 Received: by mail-wm1-f70.google.com with SMTP id l4-20020a05600c1d0400b00332f47a0fa3so1326447wms.8 for ; Fri, 17 Dec 2021 09:07:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=2+WRMJfHlXftJ9YeoYXvWKoQ/evPaqEvHg4A06Tryvs=; b=sBMzaM4Zcl1D5y9RsRU6Si4WVzANCoC2kuD6ngAp8WGbXdhgWCX8/ZY/FODLzAtdlG tr8JOyjuLZn95brkWswmC0/Ma5AgokbNfTPHy6lOhpjuk3aEpznKSwF1kngWpeW5QXux oM/738QsKU9BCq+3yFPB1Ygn1oBhB4292l27kjOLjoQWIJMBvLPymHp3hWb0tq3QoKrs FHiHAj66OWjO1pG9YEzj29Ln2Fpr/Q9LO1m5xF2frHYDWBJVjm8svZ53gMW+MCfZICc4 WUZmZBxiAWjjhhuRWt9Yloz75mj8HR1NFzVV0Hc43SxgrwzU7dwOvJw3ICTjNMUWby// 2h8Q== X-Gm-Message-State: AOAM532M605Ig+ZWPG/eKXGsMU7p8EDz7+ivm0pQ9yhq7mxL1hVoMhl9 btY3NlECPBXAtNwJ01Wv723owyu998yWfxCwGeBjELAWH5RIxqctvtihWwypwonuF59qBn6aXGD T2tZPf8c6FbDSjGyVzO2py2sV X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr3197096wrx.569.1639760837288; Fri, 17 Dec 2021 09:07:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPrYWvecakOGWsrLS6D0tWwhJI2tzgqzCBikFjyuarJQEgYziFKpjwXCffRMF6yVCr1Gcj9A== X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr3197082wrx.569.1639760837095; Fri, 17 Dec 2021 09:07:17 -0800 (PST) Received: from ?IPV6:2001:b07:6468:f312::ac3? ([2001:b07:6468:f312::ac3]) by smtp.googlemail.com with ESMTPSA id s8sm9077955wra.9.2021.12.17.09.07.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Dec 2021 09:07:16 -0800 (PST) Message-ID: <6e2518c1-78d0-8103-69ea-40a625259ef8@redhat.com> Date: Fri, 17 Dec 2021 18:07:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: linux-next: manual merge of the kvm tree with the kvm tree Content-Language: en-US To: Michael Ellerman , broonie@kernel.org, KVM Cc: Alexey Kardashevskiy , Linux Kernel Mailing List , Linux Next Mailing List , "Maciej S . Szmigiero" , Sean Christopherson References: <20211215131033.2541027-1-broonie@kernel.org> <87wnk5kvfz.fsf@mpe.ellerman.id.au> From: Paolo Bonzini In-Reply-To: <87wnk5kvfz.fsf@mpe.ellerman.id.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/16/21 05:47, Michael Ellerman wrote: > broonie@kernel.org writes: >> Hi all, >> >> Today's linux-next merge of the kvm tree got a conflict in: >> >> arch/powerpc/kvm/book3s_hv.c >> >> between commit: >> >> 511d25d6b789f ("KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots") >> >> from the kvm tree and commits: > > That's from the powerpc tree. > >> 537a17b314930 ("KVM: Let/force architectures to deal with arch specific memslot data") >> eaaaed137eccb ("KVM: PPC: Avoid referencing userspace memory region in memslot updates") >> >> 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. > > Thanks. > > Paolo, if you want to avoid the conflict going to Linus, I have that > commit (and others) in a topic branch here (based on rc2): > > https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/log/?h=topic/ppc-kvm Will pull, thanks! Paolo