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 47776C25B4E for ; Tue, 24 Jan 2023 16:16:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233298AbjAXQQD (ORCPT ); Tue, 24 Jan 2023 11:16:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbjAXQQC (ORCPT ); Tue, 24 Jan 2023 11:16:02 -0500 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CCEB3867C for ; Tue, 24 Jan 2023 08:15:57 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id c6so15211589pls.4 for ; Tue, 24 Jan 2023 08:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=aPk9FnaXAHwLaHrt31b8O1lKJt10Zrrny18ftuYst2s=; b=LYqDojeaQHL2HoA1wSz+SoLc9c2QOrTIbQbIpqZSAx0eM0iHqcmd08JhEl7Ul7xxl2 LYHVkfSXEDLeUavkJCPh3ZEVEG7VMDoYBKj4D05y10tV8KuLQHcxIjp+u24F5rSEyZ60 RmWRMJ1tXGlBKA13FAcjpzeUrnZEknGWR7osSZ1nuuB+45ddbxuxvANrWwjG7nEKuHmF FNFwL/oxOqpa4kSMxKAotuetta/cCpRLo3sA46mrdUsw6HqEz8/AGoyM/UCyrNoHO5QZ UDlXj9vOygeANg/36j0R1ei2MNxbLDfxoE8jjSfH8lx87qrS1+E0AMXorMkFsOsnqq4O +HMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aPk9FnaXAHwLaHrt31b8O1lKJt10Zrrny18ftuYst2s=; b=e+WwZOFMEGysxtFVhC8IQFAHaozPJToG0ksm1RVjrNwGVM5O3I9DvNXtwjux2Y2Hga VF1chaI/ciOHfUW/jZ5jllJoWOwVfNXwwTYxiAgJnqIP9Mu4625U+OejMzoB9ae58FKO 36yRdV+5cArbvmb12EiZWX3/z8msxBeoxv3sQww34aKEcvbrJ4OE5dDHoSqpPIiW9Ih9 XPXof4Hp/pSMF+y8MA+xz9jHCj7bGefqx6abcxqXX4Yumxe6/uCJSdDarp1ABZn07s+u z8lNLaKEDkR9FBK9H8/G2z7mgdgDUFVO41wZDkAU2ZvHSiqvTZAy0dWqi0RE4ARXH3l3 5Ylw== X-Gm-Message-State: AO0yUKUtBQga84IqpLwd9gnb2TwbEpHJDMT7phEDGYCoH583fUxGZszU Cq37yhMel3CEc/3nsAM7UozcIA== X-Google-Smtp-Source: AK7set8JayVzD/gktjyzi9/78oGfLr8uiYVAMw/+8m3wzEK0vHjiGUPHfsfLpijOnQN0Uno91anBiA== X-Received: by 2002:a17:902:74c3:b0:194:6d3c:38a5 with SMTP id f3-20020a17090274c300b001946d3c38a5mr175718plt.1.1674576956432; Tue, 24 Jan 2023 08:15:56 -0800 (PST) Received: from google.com (7.104.168.34.bc.googleusercontent.com. [34.168.104.7]) by smtp.gmail.com with ESMTPSA id ba1-20020a170902720100b00192e1590349sm1833789plb.216.2023.01.24.08.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 08:15:55 -0800 (PST) Date: Tue, 24 Jan 2023 16:15:52 +0000 From: Sean Christopherson To: Paolo Bonzini Cc: Marc Zyngier , Stephen Rothwell , KVM , Christoffer Dall , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patches in the kvm-x86 tree Message-ID: References: <20230124125515.7c88c9fb@canb.auug.org.au> <86a628mi9q.wl-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Jan 24, 2023, Paolo Bonzini wrote: > On Tue, Jan 24, 2023 at 9:47 AM Marc Zyngier wrote: > > > > Hi Stephen, > > > > On Tue, 24 Jan 2023 01:55:15 +0000, > > Stephen Rothwell wrote: > > > > > > Hi all, > > > > > > The following commits are also in other tree(s?) as different > > > commits (but the same patches): > > > > > > 0b6639e8ed87 ("KVM: s390: Move hardware setup/unsetup to init/exit") > > > 0c2be59e0b53 ("KVM: x86: Use KBUILD_MODNAME to specify vendor module name") > > > 1334f214d19f ("KVM: s390: Unwind kvm_arch_init() piece-by-piece() if a step fails") > > > > [...] > > > > > I guess someone has rebased one of the kvm trees and it had already been > > > merged into another (like the kvm or kvm-arm trees). > > > > Huh, that's worrying. I'm carrying the kvm-hw-enable-refactor branch > > from the KVM tree, which I understood to be a stable branch[1], and > > which I merged to avoid conflicts to be propagated everywhere. > > It wasn't 100% guaranteed to be stable because it was meant to be > tested and have fixes squashed in. But since I had no issues reported > from either maintainers or bots, There's one issue, but I didn't explicitly call out that it could be squashed. https://lore.kernel.org/all/20230119182158.4026656-1-seanjc@google.com > I will indeed merge commit 9f1a4c004869 aka kvm/kvm-hw-enable-refactor into > kvm/next. Sean, please rebase to drop the duplicate commits. Will do.