Message ID | mhng-5051a418-807c-4539-91b2-255492eae79f@palmer-ri-x1c9 (mailing list archive) |
---|---|
State | Accepted |
Commit | 1b5f3c51fbb8042efb314484b47b2092cdd40bf6 |
Headers | show |
Series | [GIT,PULL] RISC-V Patches for the 6.14 Merge Window, Part 1 | expand |
On Fri, Jan 31, 2025 at 12:08:40PM -0800, Palmer Dabbelt wrote: > The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4: > > Linux 6.13-rc2 (2024-12-08 14:03:39 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.14-mw1 > > for you to fetch changes up to 101971298be2aa4706c8602bd81066a0f6f2ced5: > > riscv: add a warning when physical memory address overflows (2025-01-29 18:36:09 -0800) > > ---------------------------------------------------------------- > RISC-V Patches for the 6.14 Merge Window, Part 1 > > * The PH1520 pinctrl and dwmac drivers are enabeled in defconfig. This is my fault that I did a RESEND [1] after Palmer had already applied the patch. It is already in torvalds master through soc-defconfig-6.14 [2]. I'm sorry I didn't realize my mistake sooner. Thanks, Drew [1] https://lore.kernel.org/all/Z5wy+NosgbxYk3fN@x1/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/arch/riscv/configs/defconfig
The pull request you sent on Fri, 31 Jan 2025 12:08:40 -0800 (PST):
> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.14-mw1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1b5f3c51fbb8042efb314484b47b2092cdd40bf6
Thank you!
On Fri, Jan 31, 2025 at 12:08:40PM -0800, Palmer Dabbelt wrote: > The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4: > > Linux 6.13-rc2 (2024-12-08 14:03:39 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.14-mw1 > > for you to fetch changes up to 101971298be2aa4706c8602bd81066a0f6f2ced5: > > riscv: add a warning when physical memory address overflows (2025-01-29 18:36:09 -0800) > > ---------------------------------------------------------------- > RISC-V Patches for the 6.14 Merge Window, Part 1 > > * The PH1520 pinctrl and dwmac drivers are enabeled in defconfig. > * A redundant AQRL barrier has been removed from the futex cmpxchg > implementation. > * Support for the T-Head vector extensions, which includes exposing > these extensions to userspace on systems that implement them. > * Some more page table information is now printed on die() and systems > that cause PA overflows. FYI this pull request added a 90KB ELF binary at scripts/selinux/genheaders/genheaders in the following commit: commit 101971298be2aa4706c8602bd81066a0f6f2ced5 (riscv/for-next) Author: Yunhui Cui <cuiyunhui@bytedance.com> Date: Wed Aug 14 14:26:25 2024 +0800 riscv: add a warning when physical memory address overflows Presumably a mistake, or else something a lot more interesting. - Eric
On Fri, 31 Jan 2025 at 18:00, Eric Biggers <ebiggers@kernel.org> wrote: > > FYI this pull request added a 90KB ELF binary at > scripts/selinux/genheaders/genheaders in the following commit: Grr. And yes, I missed that entirely. It's the stale version of a build-time executable that is now called security/selinux/genheaders. It got renamed some time ago. We actually have code to get rid of stale copies of that file exactly *because* the renaming caused annoying left-overs in peoples build trees that "make clean" didn't get rid of (because "make clean" just cleaned up the *new* location). So renaming generated files easily causes stale files to be left around. So it gets removed automatically by ./scripts/remove-stale-files But that removal happens as part of 'archprepare', and I suspect this got committed before the stale file removal, and then the commit got rebased (Author date of commit: last August. Commit date: this Wednesday. Date of genheaders moving: September) > Presumably a mistake, or else something a lot more interesting. Well, unlikely to be anything more interesting, since the only thing that is ever done with that file is removing it. It's not actually ever *run*. But yes, very annoying to have this in the kernel git history now, even if I'll obviously get rid of it. Thanks for noticing. Linus
Hello: This pull request was applied to riscv/linux.git (fixes) by Linus Torvalds <torvalds@linux-foundation.org>: On Fri, 31 Jan 2025 12:08:40 -0800 (PST) you wrote: > The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4: > > Linux 6.13-rc2 (2024-12-08 14:03:39 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.14-mw1 > > [...] Here is the summary with links: - [GIT,PULL] RISC-V Patches for the 6.14 Merge Window, Part 1 https://git.kernel.org/riscv/c/1b5f3c51fbb8 You are awesome, thank you!
Hello: This pull request was applied to riscv/linux.git (for-next) by Linus Torvalds <torvalds@linux-foundation.org>: On Fri, 31 Jan 2025 12:08:40 -0800 (PST) you wrote: > The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4: > > Linux 6.13-rc2 (2024-12-08 14:03:39 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.14-mw1 > > [...] Here is the summary with links: - [GIT,PULL] RISC-V Patches for the 6.14 Merge Window, Part 1 https://git.kernel.org/riscv/c/1b5f3c51fbb8 You are awesome, thank you!
diff --git a/tools/testing/selftests/riscv/vector/vstate_prctl.c b/tools/testing/selftests/riscv/vector/vstate_prctl.c remerge CONFLICT (content): Merge conflict in tools/testing/selftests/riscv/vector/vstate_prctl.c index 340ca64ccc2b..62fbb17a0556 100644 --- a/tools/testing/selftests/riscv/vector/vstate_prctl.c +++ b/tools/testing/selftests/riscv/vector/vstate_prctl.c @@ -36,19 +36,8 @@ TEST(get_control_no_v) { long rc; -<<<<<<< 101971298be2 (riscv: add a warning when physical memory address overflows) if (is_vector_supported() || is_xtheadvector_supported()) SKIP(return, "Test expects vector to be not supported"); -======= - ksft_set_plan(1); - - pair.key = RISCV_HWPROBE_KEY_IMA_EXT_0; - rc = riscv_hwprobe(&pair, 1, 0, NULL, 0); - if (rc < 0) { - ksft_test_result_fail("hwprobe() failed with %ld\n", rc); - return -1; - } ->>>>>>> 69b8923f5003 (Merge tag 'for-linus-6.14-ofs4' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) rc = prctl(PR_RISCV_V_GET_CONTROL); EXPECT_EQ(-1, rc)