From patchwork Fri Nov 25 01:22:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 25779 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3712432wrr; Thu, 24 Nov 2022 17:54:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf7zRYfi13DPnduE8aF7qyizZC/cXFvDd35IrLIHzx4lv99Z0NQByzfj3hiT6dHmgOkJBNZK X-Received: by 2002:a05:6a00:f87:b0:574:653d:9177 with SMTP id ct7-20020a056a000f8700b00574653d9177mr9081725pfb.83.1669341241076; Thu, 24 Nov 2022 17:54:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669341241; cv=none; d=google.com; s=arc-20160816; b=V+/Csu0ieDC3PenWkJuZdN6rDxbMcPFb+mOp2P9brCm++YOelFGqRXJqtwvF+W3jYe LKHaRV5vdY70Gp1qSiMfLhwVBaJjjovm6rbe/I5M8FvniKp4Uqh5761a6tWB0ocEa8JK SGgoesOlAXKKqOpkWDE7VqjmhdSHlNARrm1F8irK/RU0LCMhV5k9waHpL+xLKJUPtwRd 4mKRUrrlo+e9f2raEe4XCtPRxdn7DGHxxo5WH7Cq7Hoy34uiMqpFp3rqtHCsvPSISMIB 49ve78T5+cbBm6bKbtxhJKvHEjDnp9xI1i4wKDR5COTIy2Manr1Cb1cjZv6BXTJ8Gwmw 1UAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=saHo3P0BwjjRoCeS8vHqkJcotvhah21HE79XVudW4A8=; b=Z/tfYGmbBlri3abk2n4pWySVjPzMOEcNZ9YWTPRmIjJBL5e0RTrWCEUQxIAGO8l8VB 1WlG2CDC/RtGFWS/q08F+l5Ya455VYqcBQv5dpPLCBooMtFtDNZKp/m/VnUkCtSddZQ3 INWZdWNtsAsQ/0hW9zstlyUAkEiOPnprjyqFJY72BBQbYD++QeD710R/xopopaVYRSGi oKwpF2IYgYpcoduFyGBNhhLtM8vvMQf2p1mXxTEkxcSfR5dts6FBZdhDeAHX9QHYHCwO o/uK4Fs8TF0zxOgH0mKr+PwCws/UeLFkqrzink/eizxgL95u7jzQBVlQacvHKt7RBnnu TPaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=YdXoKpEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u1-20020a170902bf4100b00186fd58858bsi2179011pls.158.2022.11.24.17.53.47; Thu, 24 Nov 2022 17:54:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=YdXoKpEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbiKYBWZ (ORCPT + 99 others); Thu, 24 Nov 2022 20:22:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbiKYBWY (ORCPT ); Thu, 24 Nov 2022 20:22:24 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D1B615A23; Thu, 24 Nov 2022 17:22:23 -0800 (PST) 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 4NJHCY6zVtz4x1D; Fri, 25 Nov 2022 12:22:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669339339; bh=saHo3P0BwjjRoCeS8vHqkJcotvhah21HE79XVudW4A8=; h=Date:From:To:Cc:Subject:From; b=YdXoKpEBEbGG3yYiqxgt0dBcIkIROSq2g2FG/mWZW/2O+I13Cg72in6k7vlGGFiGR 3sbM2LEoEQSFh/lVIWuAZHNpyVsVlUdkhC66+kEzNKDmjjWT9e3G3xe+v8cSt1ljsx Z83Z8sNYVMnQxcIKWWrksc/zf8xSxBp+lTgN7w1t5DSbQhhhodgtn5SMio7Jp+G3KK Pn+XwRzz/FmGhHoZNhjpoArfHv02Px2wstdxnk9ncBYpAJ7a4Uzko4gFqbU9OcSY81 slHSrZgRK82hK/lTqujDACDxY3ehGqhipoFWP3+Aq3iDPDZiB9ltif0rPqLwRfJ0gJ /PoMmSaKa7Tfg== Date: Fri, 25 Nov 2022 12:22:16 +1100 From: Stephen Rothwell To: Ard Biesheuvel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Borislav Petkov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the efi tree with the tip tree Message-ID: <20221125122216.07eae5c6@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750431161133251471?= X-GMAIL-MSGID: =?utf-8?q?1750431161133251471?= Hi all, Today's linux-next merge of the efi tree got a conflict in: arch/x86/boot/compressed/efi_thunk_64.S between commit: cb8bda8ad443 ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S") from the tip tree and commit: a61962d8e7d3 ("efi: libstub: Permit mixed mode return types other than efi_status_t") from the efi tree. I fixed it up (I remofved the file and applied the following patch) 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. From: Stephen Rothwell Date: Fri, 25 Nov 2022 12:15:58 +1100 Subject: [PATCH] fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t" Signed-off-by: Stephen Rothwell --- arch/x86/boot/compressed/efi_mixed.S | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/boot/compressed/efi_mixed.S b/arch/x86/boot/compressed/efi_mixed.S index 8b02e507d3bb..4ca70bf93dc0 100644 --- a/arch/x86/boot/compressed/efi_mixed.S +++ b/arch/x86/boot/compressed/efi_mixed.S @@ -132,12 +132,6 @@ SYM_FUNC_START(__efi64_thunk) movl %ebx, %fs movl %ebx, %gs - /* - * Convert 32-bit status code into 64-bit. - */ - roll $1, %eax - rorq $1, %rax - pop %rbx pop %rbp RET