From patchwork Thu Oct 28 06:16:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12589367 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C97A3C433F5 for ; Thu, 28 Oct 2021 06:17:02 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DEC160F92 for ; Thu, 28 Oct 2021 06:17:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6DEC160F92 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.217652.377761 (Exim 4.92) (envelope-from ) id 1mfyiU-000499-Ns; Thu, 28 Oct 2021 06:16:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 217652.377761; Thu, 28 Oct 2021 06:16:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfyiU-000492-Kz; Thu, 28 Oct 2021 06:16:46 +0000 Received: by outflank-mailman (input) for mailman id 217652; Thu, 28 Oct 2021 06:16:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfyiS-00048u-6S for xen-devel@lists.xenproject.org; Thu, 28 Oct 2021 06:16:45 +0000 Received: from gandalf.ozlabs.org (unknown [150.107.74.76]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c18ac763-5c92-43e6-90d4-0612c6b33863; Thu, 28 Oct 2021 06:16:40 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4HfwLV6NF6z4xcB; Thu, 28 Oct 2021 17:16:34 +1100 (AEDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c18ac763-5c92-43e6-90d4-0612c6b33863 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1635401796; bh=RZCVeOXwcdZa/nUqU9rKDWY5H15gYWvRWpcvq5i8Ge0=; h=Date:From:To:Cc:Subject:From; b=KxxaLlCJKUB3tk2ICp52vJiupSdOjd0U/C1dxifNIKXuuczTJpshFtBKr4OTAMVbL 2WWLRt0t0dZu+5jgCscb4xEiiZ+Gt+QLSIG7VlRp0zlDxCzhSjNlCzHHkN8KjspCC4 +XBmqBPucM69dELcL+TqMLawq6UW3ZCgeTDJeqAbpdG4eVkWqMCVF3z6s8rKFq+rWU WJOFX/qBCn7j0dFLGOQPk0K6Z733SPL39JLULFUdRoYCXaxASve41nXeYyr9KCL/mh Awd/Vs7rvOPUg0ivwkc4vrd4Mod5oXDgPG8B22ItA4AIoU/w6IMVVV2urFbznDE8Sr xMSb5bvMvjFDw== Date: Thu, 28 Oct 2021 17:16:33 +1100 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the xen-tip tree with the tip tree Message-ID: <20211028171633.603441ef@canb.auug.org.au> MIME-Version: 1.0 Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: arch/x86/xen/irq.c between commits: 20125c872a3f ("x86/xen: Make save_fl() noinstr") d7bfc7d57cbe ("x86/xen: Make irq_enable() noinstr") 09c413071e2d ("x86/xen: Make irq_disable() noinstr") 1462eb381b4c ("x86/xen: Rework the xen_{cpu,irq,mmu}_opsarrays") from the tip tree and commit: 97c79d816979 ("x86/xen: switch initial pvops IRQ functions to dummy ones") from the xen-tip 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. There may be more required, though. diff --cc arch/x86/xen/irq.c index 4fe387e520af,ae8537583102..000000000000 --- a/arch/x86/xen/irq.c