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 95695C43217 for ; Thu, 20 Jan 2022 10:50:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbiATKuv (ORCPT ); Thu, 20 Jan 2022 05:50:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:59400 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376399AbiATKrT (ORCPT ); Thu, 20 Jan 2022 05:47:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642675638; 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=qO1hZafvyKcBxQP78yk3hqC/9kFUIj2Avg9axdX+yPo=; b=OZHe9T7smZ+tJe7rucU2a3BClATfnnHYUg4Z8esgdgor+Xc32iGjWRXNcevcv8qRjhQ9du fNeHTcRLM7XTpu9KA8Bc7/gEpi6oDV3koxPfLoSEcguFzsnHBVg9vmoBSIDOehL9s+e9Cr Pir0x7P3zTb53xJ2t8SWtpOYWeuOR64= 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-117-ZfiickwMO-OpFgAgdS0T_Q-1; Thu, 20 Jan 2022 05:47:17 -0500 X-MC-Unique: ZfiickwMO-OpFgAgdS0T_Q-1 Received: by mail-wm1-f70.google.com with SMTP id s190-20020a1ca9c7000000b00347c6c39d9aso3804935wme.5 for ; Thu, 20 Jan 2022 02:47:16 -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=qO1hZafvyKcBxQP78yk3hqC/9kFUIj2Avg9axdX+yPo=; b=Y4RwL09f+aEPpFEbBgfXaJAikTjG2RZC6/ssFOqSGl8wuex2uzyhZRjxgkEge1slA0 pW5y0AJ7k4UWqeL4YcOeRqGaOI1FiLniJ2H5KeB8SKT6In6R5Bm5vdH+4SNblzXWcf0E 9dfUdNSUtNPGTan5GJoLjc6TrPQWuo3cpun9Gy0MGi14d1n5DTUv5VHhg1l8KXz3vasE V6SNZOW1OName0WySMnSxA8wa1WmMQI6T7kzfhBaQG7ii1JRFXYF+mV2q83ta6HYw5qU qnhlzsemkvO0W+HX5I/vDYnUzgcqQveSexk6Cv/8CPhJVdCbG7KIDzS15RUYkAx2eXO+ rUWg== X-Gm-Message-State: AOAM53074fgbZUc5jJ1ARb+CixnoVCCjtDGe3CEV7Lfm3MMdz0cBwxLP EUyMKPjI73Ais8AdUpKsVFCLSSohWqthChMl6H7REwYvnrQduQx7iAI+TbCyCitNsjxhofvF19q ufNP0BhDIKyIx+gkELwG8u5m6 X-Received: by 2002:adf:e6cb:: with SMTP id y11mr5521817wrm.680.1642675635949; Thu, 20 Jan 2022 02:47:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcrwDfaLaSDQRGqrng7EFnJZ80JOK/Ll6EzS9W8XU5xUayOcQx0qNZa9uj2wnfeK8hisgMXg== X-Received: by 2002:adf:e6cb:: with SMTP id y11mr5521797wrm.680.1642675635763; Thu, 20 Jan 2022 02:47:15 -0800 (PST) Received: from ?IPV6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.googlemail.com with ESMTPSA id f17sm1972724wml.31.2022.01.20.02.47.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Jan 2022 02:47:14 -0800 (PST) Message-ID: Date: Thu, 20 Jan 2022 11:47:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: linux-next: manual merge of the kvm-fixes tree with Linus' tree Content-Language: en-US To: Stephen Rothwell , KVM Cc: Linux Kernel Mailing List , Linux Next Mailing List , Marcelo Tosatti , Sean Christopherson References: <20220120092527.71e3a85f@canb.auug.org.au> From: Paolo Bonzini In-Reply-To: <20220120092527.71e3a85f@canb.auug.org.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 1/19/22 23:25, Stephen Rothwell wrote: > It may be worth while rebasing this fix on top of Linus' current tree. Yes, the next pull request will include a merge commit to avoid the conflict. Paolo