From patchwork Mon May 23 06:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12858484 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 18F04C433EF for ; Mon, 23 May 2022 06:31:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.335381.559602 (Exim 4.92) (envelope-from ) id 1nt1af-0005e4-R0; Mon, 23 May 2022 06:30:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 335381.559602; Mon, 23 May 2022 06:30:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nt1af-0005dw-NU; Mon, 23 May 2022 06:30:53 +0000 Received: by outflank-mailman (input) for mailman id 335381; Mon, 23 May 2022 06:30:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nt1ae-0005dq-8U for xen-devel@lists.xenproject.org; Mon, 23 May 2022 06:30:53 +0000 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e0a41347-da61-11ec-837e-e5687231ffcc; Mon, 23 May 2022 08:30:48 +0200 (CEST) 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 4L66sG0b1tz4xD8; Mon, 23 May 2022 16:30:41 +1000 (AEST) 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: e0a41347-da61-11ec-837e-e5687231ffcc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653287444; bh=xgg1hS9BSFr5BuV1JPPaBTBshDJNljlVHdKXJO5tQ78=; h=Date:From:To:Cc:Subject:From; b=sYnPmLi8oYAqcYCjY6GHNChs5KYvus+P0r4Ha+hu2Qpo4kVIGVj3bhfLVwJn2ECT9 PItx4IuEgzjyncJt2ukJrkkvkgo/Fv1BP4r3Sg01O985QC2dDBSVqergEj1J6aeBmX ixUmaX8DtshIG85goiSPBdK6QLcd+4Upjjm8mwLFnhm21hocfXOfWy3xy9rOrqLOqU ah63LfYwt5wNL9w1tP47lwxGiCsdZJRhodfw3bW4nWXtmpm5os/6fD7q7RffpbUVdE GDUC0EEl/UfPdyuTfLneQT6/f8y+tw87u/TO1lbIuDfaV7ECB1+RjP5meIVBOmXYfT GTl8/z/PRXEbg== Date: Mon, 23 May 2022 16:30:40 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , "Rafael J. Wysocki" Cc: Xen Devel , Dmitry Osipenko , Linux Kernel Mailing List , Linux Next Mailing List , Maximilian Heyne , "Rafael J. Wysocki" Subject: linux-next: manual merge of the xen-tip tree with the pm tree Message-ID: <20220523163040.6064b190@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/enlighten_pv.c between commit: f089ab674cea ("xen/x86: Use do_kernel_power_off()") from the pm tree and commit: 1591a65f55bc ("x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid") 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. diff --cc arch/x86/xen/enlighten_pv.c index af1f6e886225,ca85d1409917..000000000000 --- a/arch/x86/xen/enlighten_pv.c