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 E1CFFC43334 for ; Tue, 26 Jul 2022 09:48:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238464AbiGZJr7 (ORCPT ); Tue, 26 Jul 2022 05:47:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238294AbiGZJr5 (ORCPT ); Tue, 26 Jul 2022 05:47:57 -0400 Received: from out30-45.freemail.mail.aliyun.com (out30-45.freemail.mail.aliyun.com [115.124.30.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B76C031362; Tue, 26 Jul 2022 02:47:55 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R931e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=22;SR=0;TI=SMTPD_---0VKV-R7N_1658828869; Received: from B-LB6YLVDL-0141.local(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VKV-R7N_1658828869) by smtp.aliyun-inc.com; Tue, 26 Jul 2022 17:47:51 +0800 Subject: Re: [RESEND PATCH V2 0/5] Fixups to work with crash tool To: Conor.Dooley@microchip.com Cc: alexandre.ghiti@canonical.com, heiko@sntech.de, palmer@dabbelt.com, mick@ics.forth.gr, guoren@kernel.org, kexec@lists.infradead.org, bhe@redhat.com, linux-doc@vger.kernel.org, vgoyal@redhat.com, linux-riscv@lists.infradead.org, dyoung@redhat.com, linux-kernel@vger.kernel.org, crash-utility@redhat.com, huanyi.xj@alibaba-inc.com, heinrich.schuchardt@canonical.com, anup@brainfault.org, corbet@lwn.net, k-hagio-ab@nec.com, hschauhan@nulltrace.org, paul.walmsley@sifive.com, aou@eecs.berkeley.edu References: <20220725014539.1037627-1-xianting.tian@linux.alibaba.com> <51c97da7-422f-1b5b-03d3-dc36c9132c2a@microchip.com> <7a395f64-8ec7-e07f-e763-afc1f2611c75@linux.alibaba.com> <2301681f-361d-b85b-e255-3bf449ceeaa9@microchip.com> <6320e6dd-ebd9-3575-a85f-c3a2f92e9f54@linux.alibaba.com> <31b13104-cc37-985a-cdeb-05a9507fa74c@microchip.com> From: Xianting Tian Message-ID: <9fe2ec74-3062-4c23-2683-6a7e4a4765e7@linux.alibaba.com> Date: Tue, 26 Jul 2022 17:47:49 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <31b13104-cc37-985a-cdeb-05a9507fa74c@microchip.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2022/7/26 下午5:42, Conor.Dooley@microchip.com 写道: > On 26/07/2022 10:28, Xianting Tian wrote: >> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe >> >> 在 2022/7/26 下午4:16, Xianting Tian 写道: >>> 在 2022/7/26 下午4:01, Conor.Dooley@microchip.com 写道: >>>> On 26/07/2022 08:54, tianxianting wrote: >>>>> 在 2022/7/26 上午1:13, Conor.Dooley@microchip.com 写道: >>>>>> That said, this does not apply to riscv/for-next: >>>>>> b4 shazam 20220725014539.1037627-1-xianting.tian@linux.alibaba.com >>>>>> Grabbing thread from >>>>>> lore.kernel.org/all/20220725014539.1037627-1-xianting.tian%40linux.alibaba.com/t.mbox.gz >>>>>> Checking for newer revisions on https://lore.kernel.org/all/ >>>>>> Analyzing 6 messages in the thread >>>>>> Checking attestation on all messages, may take a moment... >>>>>> --- >>>>>>     [PATCH v2 1/5] RISC-V: use __smp_processor_id() instead of >>>>>> smp_processor_id() >>>>>>     [PATCH v2 2/5] RISC-V: Add arch_crash_save_vmcoreinfo support >>>>>>     [PATCH v2 3/5] riscv: Add modules to virtual kernel memory >>>>>> layout dump >>>>>>     [PATCH v2 4/5] RISC-V: Fixup getting correct current pc >>>>>>     [PATCH v2 5/5] riscv: crash_core: Export kernel vm layout, >>>>>> phys_ram_base >>>>>> --- >>>>>> Total patches: 5 >>>>>> --- >>>>>> Applying: RISC-V: use __smp_processor_id() instead of >>>>>> smp_processor_id() >>>>>> Applying: RISC-V: Add arch_crash_save_vmcoreinfo support >>>>>> Patch failed at 0002 RISC-V: Add arch_crash_save_vmcoreinfo support >>>>> patch 2 apply is OK for me, I don't know why you failed :( >>>>> Do you have more detals for this? >>>>> >>>> What did you apply it to? It does not apply for me to riscv/for-next: >>>> https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git/log/?h=for-next >>>> >>> This 5 patches are based on the master branch of below git: >>> >>> https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git >>> >>> >>> "git am 0002-RISC-V-Add-arch_crash_save_vmcoreinfo-support.patch" to >>> this git is ok for me. >>> >>> All is correct? >> I figured out the reason, there is one difference in >> arch/riscv/kernel/Makefile between riscv/for-next and torvalds/linux. >> >> For riscv/for-next, in line 81 of arch/riscv/kernel/Makefile, it is: >> >>     obj-$(CONFIG_KEXEC)        += kexec_relocate.o crash_save_regs.o >> machine_kexec.o >> >> But for torvalds/linux, in line 81 of arch/riscv/kernel/Makefile, it is: >> >>     obj-$(CONFIG_KEXEC_CORE)        += kexec_relocate.o >> crash_save_regs.o machine_kexec.o >> >> torvalds/linux is newer than riscv/for-next,  commit 3a66a08759 >> ("RISC-V: kexec: Fix build error without CONFIG_KEXEC") added >> "CONFIG_KEXEC_CORE" for torvalds/linux, But riscv/for-next >> >> doesn't contain the commit. > Ah right, since it's late in the cycle (mw is next week) maybe > it's best to wait for rc1 then and rebase when for-next & fixes > have been synced. Conflict doesn't seem to hard to sort out for > those who use kexec ;) Okay, thanks. > > Thanks, > Conor. >