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 X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A4F6C433DF for ; Mon, 19 Oct 2020 21:30:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6EB8223B0 for ; Mon, 19 Oct 2020 21:30:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=dabbelt-com.20150623.gappssmtp.com header.i=@dabbelt-com.20150623.gappssmtp.com header.b="DudHOiER" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733037AbgJSVaV (ORCPT ); Mon, 19 Oct 2020 17:30:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733026AbgJSVaV (ORCPT ); Mon, 19 Oct 2020 17:30:21 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9089C0613CE for ; Mon, 19 Oct 2020 14:30:19 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id gv6so524344pjb.4 for ; Mon, 19 Oct 2020 14:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=rZYhKAIK/CTzJe6R9x8W3sg50ZvbSzRMIoJEcrLqu8M=; b=DudHOiERuzz1tDVL7EiSQZgiTARWZcg9wEuAuIbrh5pgEIPiGpBImyOgToTQv/pgaE +sicT7TABXgY80atmdgByVdIRRhZGXOZJ8JCkfkQW8ES7g124jJOhYZtAkG6DZG07jxY qlVUo7NTyHFBrydg1Z8L7rsTBkgjEtnQRxjG+mwbgmEUlb8qK7su7n5Z+fFlzZbfnPKO B4eh1hPPqII+d5UbguzcnW7tEh6zqVWIMO5jeCDK4dgqnMWRMKlCqU8Xqeo/TvXaWuJA krdz2MgDNZz9Z7QKL1TnjXyvfPAV1vBFEvqYoYAeH1lWx0/5pXz/rcpTfunF6LetGUJl +6fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=rZYhKAIK/CTzJe6R9x8W3sg50ZvbSzRMIoJEcrLqu8M=; b=T4EqQo/jC9gKIxLF3f1fUT8OwSexFSMty6xGJnYpjrxGXSCZ9nJw/7hF3Z2ivqHn/8 UCb9TOuZKDNKotKiq16N8M5iXBMOMvIAf/MAdBaNv0FHCWLX/QEKw7jL3h+FaMgYW2TR 0pO94VtCMM6xlIy75gOORm8nfs1KLMYufhv3nEHC8g00Bcisecx8QvqqDKFCPS4xRINa cav1FYLomMbhiJP7XiRuTJMQMioLzlcKPZ0RYWAHzk4e/YkzlkGW7psSAh+XQAmF3SbQ 0/tTuZo33stDaUae6Z0jZF8TsS51HJTHVd5WYJyKY0aruzYIZ/PYwNQIJRYtguBXlEv0 IgFQ== X-Gm-Message-State: AOAM5331oIkVkuC9aBfQZSXIm9FbCygVe8wU1kUWqFmtRU3Be4M6dsb8 EJhJ2YDlSDbsjzUVvlKo/h5shw== X-Google-Smtp-Source: ABdhPJydXDOsEfhE0j4FbL9oG0N/NdSa7o6K3hd4CmeFvLTqrW6uI9We/mYNiVAfXvj0SNTjMgqFOA== X-Received: by 2002:a17:902:c1d2:b029:d3:e6e9:c391 with SMTP id c18-20020a170902c1d2b02900d3e6e9c391mr1794898plc.49.1603143019231; Mon, 19 Oct 2020 14:30:19 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id u65sm688776pfc.11.2020.10.19.14.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 14:30:18 -0700 (PDT) Date: Mon, 19 Oct 2020 14:30:18 -0700 (PDT) X-Google-Original-Date: Mon, 19 Oct 2020 14:30:17 PDT (-0700) Subject: Re: [GIT PULL] RISC-V Patches for the 5.10 Merge Window, Part 1 In-Reply-To: CC: atishp@atishpatra.org, Linus Torvalds , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org From: Palmer Dabbelt To: ardb@kernel.org Message-ID: Mime-Version: 1.0 (MHng) 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 On Mon, 19 Oct 2020 14:21:33 PDT (-0700), ardb@kernel.org wrote: > On Mon, 19 Oct 2020 at 23:00, Palmer Dabbelt wrote: >> >> On Mon, 19 Oct 2020 13:43:27 PDT (-0700), atishp@atishpatra.org wrote: >> > On Mon, Oct 19, 2020 at 12:08 PM Palmer Dabbelt wrote: >> >> >> >> The following changes since commit d012a7190fc1fd72ed48911e77ca97ba4521bccd: >> >> >> >> Linux 5.9-rc2 (2020-08-23 14:08:43 -0700) >> >> >> >> are available in the Git repository at: >> >> >> >> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-5.10-mw0 >> >> >> >> for you to fetch changes up to de22d2107ced3cc5355cc9dbbd85e44183546bd5: >> >> >> >> RISC-V: Add page table dump support for uefi (2020-10-02 14:31:33 -0700) >> >> >> >> ---------------------------------------------------------------- >> >> RISC-V Patches for the 5.10 Merge Window, Part 1 >> >> >> >> This contains a handful of cleanups and new features, including: >> >> >> >> * A handful of cleanups for our page fault handling. >> >> * Improvements to how we fill out cacheinfo. >> >> * Support for EFI-based systems. >> >> >> >> --- >> >> >> >> This contains a merge from the EFI tree that was necessary as some of the EFI >> >> support landed over there. It's my first time doing something like this, >> >> >> >> I haven't included the set_fs stuff because the base branch it depends on >> >> hasn't been merged yet. I'll probably have another merge window PR, as >> >> there's more in flight (most notably the fix for new binutils I just sent out), >> >> but I figured there was no reason to delay this any longer. >> >> >> >> There is one merge conflict, which is between my fixes and for-next branches: >> >> >> >> diff --cc arch/riscv/kernel/vmlinux.lds.S >> >> index 67db80e12d1f,9795359cb9da..ffaa3da375c2 >> >> --- a/arch/riscv/kernel/vmlinux.lds.S >> >> +++ b/arch/riscv/kernel/vmlinux.lds.S >> >> @@@ -66,8 -71,11 +70,13 @@@ SECTION >> >> _etext = .; >> >> } >> >> >> >> + INIT_DATA_SECTION(16) >> >> + >> >> + #ifdef CONFIG_EFI >> >> + . = ALIGN(PECOFF_SECTION_ALIGNMENT); >> >> + __pecoff_text_end = .; >> >> + #endif >> >> + >> >> /* Start of data section */ >> >> _sdata = .; >> >> RO_DATA(SECTION_ALIGN) >> >> >> >> ---------------------------------------------------------------- >> >> Anup Patel (1): >> >> RISC-V: Move DT mapping outof fixmap >> >> >> >> Ard Biesheuvel (3): >> >> efi/libstub: arm32: Base FDT and initrd placement on image address >> >> efi/libstub: Export efi_low_alloc_above() to other units >> >> efi/libstub: arm32: Use low allocation for the uncompressed kernel >> >> >> > >> > I thought these 3 were being taken through the EFI tree. I already see >> > them in the master branch. >> > >> > 762cd288fc4a efi/libstub: arm32: Use low allocation for the uncompressed kernel >> > 1a895dbf4b66 efi/libstub: Export efi_low_alloc_above() to other units >> > 6208857b8f7e efi/libstub: arm32: Base FDT and initrd placement on image address >> >> I see them in Linus' master with those exact hashes, so IIUC this is all OK? I >> guess I just assumed they were supposed to show up in the shortlog, but it's my >> first time trying one of these multi-tree merges so maybe I screwed something >> up? >> >> I obtained these by merging a tag from the EFI tree (that's already been >> merged) into my tree, which looks OK to me: >> >> commit 8a3f30c4319dc70547f11c18da2e7b5987543aa1 >> gpg: Signature made Fri 02 Oct 2020 02:30:05 PM PDT >> gpg: using RSA key 2B3C3747446843B24A943A7A2E1319F35FBB1889 >> gpg: issuer "palmer@dabbelt.com" >> gpg: Good signature from "Palmer Dabbelt " [ultimate] >> gpg: aka "Palmer Dabbelt " [ultimate] >> merged tag 'efi-riscv-shared-for-v5.10' >> gpg: Signature made Wed 16 Sep 2020 08:57:07 AM PDT >> gpg: using RSA key 9CD2A0DA6AD8F7330175E2BBC237207E9574FA7D >> gpg: Good signature from "Adriaan (Ard) Biesheuvel " [unknown] >> gpg: aka "Adriaan (Ard) Biesheuvel " [unknown] >> gpg: aka "Adriaan (Ard) Biesheuvel " [unknown] >> gpg: aka "Adriaan (Ard) Biesheuvel " [unknown] >> gpg: WARNING: This key is not certified with a trusted signature! >> gpg: There is no indication that the signature belongs to the owner. >> Primary key fingerprint: F43D 0332 8115 A198 C900 1688 3D20 0E9C A632 9909 >> Subkey fingerprint: 9CD2 A0DA 6AD8 F733 0175 E2BB C237 207E 9574 FA7D >> Merge: 54701a0d12e2 762cd288fc4a >> Author: Palmer Dabbelt >> Date: Fri Oct 2 14:29:51 2020 -0700 >> >> Merge tag 'efi-riscv-shared-for-v5.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/efi/efi into for-next >> >> Stable branch for v5.10 shared between the EFI and RISC-V trees >> >> The RISC-V EFI boot and runtime support will be merged for v5.10 via >> the RISC-V tree. However, it incorporates some changes that conflict >> with other EFI changes that are in flight, so this tag serves as a >> shared base that allows those conflicts to be resolved beforehand. >> >> * tag 'efi-riscv-shared-for-v5.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/efi/efi: >> efi/libstub: arm32: Use low allocation for the uncompressed kernel >> efi/libstub: Export efi_low_alloc_above() to other units >> efi/libstub: arm32: Base FDT and initrd placement on image address >> efi: Rename arm-init to efi-init common for all arch >> include: pe.h: Add RISC-V related PE definition >> >> I think the actual issue here is just that whatever I pointed git to when >> generating the PR didn't contain the merge of the shared code yet, so >> git-shortlog included it? >> > > This all looks fine. Usually in such cases, you don't know which > branch will gets pulled first, so it makes sense for each PR to > describe the shared changes. OK, good to know -- I'd just been pointing my PRs at Linus' latest tag, rather than directly at master, as it's less of a moving target. Sounds like that's a reasonable thing to do, so I'll probably keep doing it (unless I forget ;)) Linus: Looks like this was all actually fine, but LMK if you have any issues.