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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 A7440C2D0DB for ; Fri, 31 Jan 2020 21:24:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8211B20CC7 for ; Fri, 31 Jan 2020 21:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726530AbgAaVYN (ORCPT ); Fri, 31 Jan 2020 16:24:13 -0500 Received: from mx2.suse.de ([195.135.220.15]:45584 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726336AbgAaVYN (ORCPT ); Fri, 31 Jan 2020 16:24:13 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8E716AD85; Fri, 31 Jan 2020 21:24:11 +0000 (UTC) Date: Fri, 31 Jan 2020 22:24:04 +0100 From: Borislav Petkov To: Paolo Bonzini Cc: Linus Torvalds , Sean Christopherson , Xiaoyao Li , Linux Kernel Mailing List , KVM list Subject: Re: [GIT PULL] First batch of KVM changes for 5.6 merge window Message-ID: <20200131212404.GD14851@zn.tnic> References: <1580408442-23916-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 31, 2020 at 10:08:10PM +0100, Paolo Bonzini wrote: > I was supposed to get a topic branch and fix everything up so that both > CPU_BASED_ and VMX_FEATURE_ constants would get the new naming. When > Boris alerted me of the conflict and I said "thanks I'll sort it out", > he probably interpreted it as me not needing the topic branch anymore. > I then forgot to remind him, and here we are. Damn, that was a misunderstanding. I actually had a topic branch: tip:x86/cpu and was assuming that you'll see it from the tip-bot notifications. But they went to lkml and you weren't CCed. And regardless, I should've told you explicitly which one it is, sorry about that. I'll be more explicit next time. Thx. -- Regards/Gruss, Boris. SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg