From patchwork Thu Nov 10 05:09:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 17951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp736864wru; Wed, 9 Nov 2022 21:25:51 -0800 (PST) X-Google-Smtp-Source: AMsMyM4uF2wqvFR6D8v0X6GHwsnBcd49G5jbslDDFZj3WHUlKtx/nh+7uG31aee0MrRFy5shaQhm X-Received: by 2002:a05:6a00:158e:b0:56c:8dbc:f7a6 with SMTP id u14-20020a056a00158e00b0056c8dbcf7a6mr64794029pfk.80.1668057950733; Wed, 09 Nov 2022 21:25:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668057950; cv=none; d=google.com; s=arc-20160816; b=m1LKCyov3U9jPws4WP5kwe4h5qbT0ClFsFNlpIGoDTcuoLTPBYLO70CkPpdVagwpkZ 5M9mrxiimoXqEIhqP00qp3mVwDVjYgCcsz3jWFgDhux3T6PF9mIcLLXe/2zLl790hKP3 VfE9ousDbIKARC1gfURtqN2v61Rqkg60el5YwhXabGzDQQqxEf7jBf9XStCIlCnAUn4b tWKeKsrdsYcaoszW9GKkMsfeBXmr25CDsd+4zL5TR0wiCWw8K0joZBkN0KioMWn56id8 g8/sIn6zStHY29deP3oDXYY7yC8SZzZ1wxilCcgRXDFMPSNCB1uSTFG+jtc8D5Hkx3bM Y0PQ== 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=t1Zs9kyiW0gGCqlM+108NhrzNMiXqtOdDkhiwRDuybI=; b=HoAATpJSPOzl6WTfQdCKCRBZ44HlTif3ghp/DeKc+qZCwVOr+pfaRW1hfWfnj8IuD4 ScvGey4hVzuASUb1Wz2cTEjGPi1hE/AkSsomB2k9NMW4A8H4UEDUf/yfB9s3JUwH9Aq4 qkVr26W+2r+qndi2l1E2z/6eOYg1jWRC6Hr+5a0lPQLFzqb1jD+KcfQXrWy3mUhwt+Ay Wx2TmwyoTZD/0FtZhyBOZfbPDV+7LmpGeOSOUIn9539lWzJXpDWujHb2CrIYYjlxyWGc pdN8fSnQe3ZM8dVVUR9wrTpJoB/ptILwc5wgaOyi982YYWSaXKOGnc7IfTPQyR9dOR2U DIhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KaFSnpyY; 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 y9-20020a655a09000000b0046fcec7f27asi18641598pgs.506.2022.11.09.21.25.28; Wed, 09 Nov 2022 21:25:50 -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=KaFSnpyY; 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 S231535AbiKJFJL (ORCPT + 99 others); Thu, 10 Nov 2022 00:09:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbiKJFJJ (ORCPT ); Thu, 10 Nov 2022 00:09:09 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A132C2B1B8; Wed, 9 Nov 2022 21:09:07 -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 4N78y91rybz4xGT; Thu, 10 Nov 2022 16:09:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668056945; bh=t1Zs9kyiW0gGCqlM+108NhrzNMiXqtOdDkhiwRDuybI=; h=Date:From:To:Cc:Subject:From; b=KaFSnpyYTblTDwELjpAvfWZqcnSPqeVZass62HvV24hdbfkEDilIf95Uz2qec3iDo fJ9I/W7gQrctebulesjhNppoDh2dZoS+oozowgu2hNHwnlvRZCtpqwxMh/59RtkMU3 /k5t9Ek/mavhLFVmC9Bu5TBzQyNCdCALkV+Z4YXXFZ9auoi1ZnQFP+1VmVS9edF/CE Gz9RmBxInXorCs7XceQSwd3bIDAaqADp9b5KirXEvpdaP2EzmEfKCuTEe1CSmv2YVb zsqePCq/Kmj2hsKKifGn9b5l2FovaODp3ObkutgLUc17jFm5ZHGKpgXq3whdYhV0Ng oBMGyi9ax+0Jg== Date: Thu, 10 Nov 2022 16:09:03 +1100 From: Stephen Rothwell To: Ard Biesheuvel , Catalin Marinas , Will Deacon Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the efi tree with the arm64 tree Message-ID: <20221110160903.062515c8@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,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?1749085534200219800?= X-GMAIL-MSGID: =?utf-8?q?1749085534200219800?= Hi all, Today's linux-next merge of the efi tree got a conflict in: drivers/firmware/efi/libstub/Makefile between commit: 68c76ad4a957 ("arm64: unwind: add asynchronous unwind tables to kernel and modules") from the arm64 tree and commit: 0d60ffeec53c ("efi: libstub: Deduplicate ftrace command line argument filtering") from the efi 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 drivers/firmware/efi/libstub/Makefile index 1016f0b5311d,402dfb30ddc7..000000000000 --- a/drivers/firmware/efi/libstub/Makefile