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 02704C38142 for ; Tue, 24 Jan 2023 08:47:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233013AbjAXIrK (ORCPT ); Tue, 24 Jan 2023 03:47:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232559AbjAXIrJ (ORCPT ); Tue, 24 Jan 2023 03:47:09 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E06832533; Tue, 24 Jan 2023 00:47:02 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 09DBFB80F10; Tue, 24 Jan 2023 08:47:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1577C433EF; Tue, 24 Jan 2023 08:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674550019; bh=IY1JiC1oRAjnhaWxVJ9ysa7pffnfQj3zjXFKj+NMIhs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=banXH7kytPllxOUHpd5VNZr60bDUXhZQIkqcEsbodHhv3YsjjPxVPHBQVqfwi+mX6 i+9hhns+IwN79XIC83USQGML9UzaHP7flISvwKXqshKm6duQVE30f5TypEEDKaQk3Y aPGX0c9GtHk3CFTvRhvYnI1eKlztH7zPF3yIsqQWgi7wFp8VdyoHVNtL5xvzR5g+Yc fLbRthmQ0vR7gyZSc+wz2vb6mydNPBUx2Mh4K2cPkT6wxgKaUV+BQdxibGWXEdVVen +4u8e+/9APeQwIHpvwEnCj6hJ3pAjd6hgHcGYwsG6DOoqEOMaY3bHtIOk2KdNaOCID z1GWQhHAAv0jg== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pKExF-004BqN-Ik; Tue, 24 Jan 2023 08:46:57 +0000 Date: Tue, 24 Jan 2023 08:46:57 +0000 Message-ID: <86a628mi9q.wl-maz@kernel.org> From: Marc Zyngier To: Stephen Rothwell , Sean Christopherson , Paolo Bonzini Cc: KVM , Christoffer Dall , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patches in the kvm-x86 tree In-Reply-To: <20230124125515.7c88c9fb@canb.auug.org.au> References: <20230124125515.7c88c9fb@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: sfr@canb.auug.org.au, seanjc@google.com, pbonzini@redhat.com, kvm@vger.kernel.org, cdall@cs.columbia.edu, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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. Paolo, Sean: what is the *real* status of this branch? M. [1] https://lore.kernel.org/r/4d73d1b9-2c28-ab6a-2963-579bcc7a9e67@redhat.com -- Without deviation from the norm, progress is not possible.