From: Michael Ellerman <mpe@ellerman.id.au>
To: Masahiro Yamada <masahiroy@kernel.org>,
Palmer Dabbelt <palmer@rivosinc.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] RISC-V Patches for the 6.10 Merge Window, Part 1
Date: Thu, 23 May 2024 21:59:15 +1000 [thread overview]
Message-ID: <87ed9s3fjg.fsf@mail.lhotse> (raw)
In-Reply-To: <CAK7LNASVhbtJ2=72TsCu1C7+uLsXySNffPcNZU2NiFKitM6-Ew@mail.gmail.com>
Masahiro Yamada <masahiroy@kernel.org> writes:
> On Thu, May 23, 2024 at 1:13 AM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>>
>> The following changes since commit 4cece764965020c22cff7665b18a012006359095:
>>
>> Linux 6.9-rc1 (2024-03-24 14:10:05 -0700)
>>
>> are available in the Git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.10-mw1
>>
>> for you to fetch changes up to 92cce91949a497a8a4615f9ba5813b03f7a1f1d5:
>>
>> riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800 (2024-05-13 14:26:34 -0700)
...
>>
>> Masahiro Yamada (2):
>> riscv: merge two if-blocks for KBUILD_IMAGE
>> export.h: remove include/asm-generic/export.h
>
>
> I am confused.
>
>
> This commit was applied two months ago by myself,
> and it already existed in the mainline.
>
>
> After this pull request, I do not see no such a commit
> applied by Palmer.
It is in there:
$ git log --pretty=fuller -1 36d37f11f555812b0ded5d15aa686a6b9da57f61
commit 36d37f11f555812b0ded5d15aa686a6b9da57f61
Author: Masahiro Yamada <masahiroy@kernel.org>
AuthorDate: Sat Mar 23 18:06:15 2024 +0900
Commit: Palmer Dabbelt <palmer@rivosinc.com>
CommitDate: Wed Mar 27 07:14:19 2024 -0700
export.h: remove include/asm-generic/export.h
Commit 3a6dd5f614a1 ("riscv: remove unneeded #include
<asm-generic/export.h>") removed the last use of
include/asm-generic/export.h.
This deprecated header can go away.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20240323090615.1244904-1-masahiroy@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Or via:
$ git log --oneline -2 92cce91949a497a8a4615f9ba5813b03f7a1f1d5 origin/master -- include/asm-generic/export.h
0316e4b04e01 export.h: remove include/asm-generic/export.h
36d37f11f555 export.h: remove include/asm-generic/export.h
cheers
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2024-05-23 11:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 16:13 [GIT PULL] RISC-V Patches for the 6.10 Merge Window, Part 1 Palmer Dabbelt
2024-05-22 16:18 ` Conor Dooley
2024-05-22 18:05 ` pr-tracker-bot
2024-05-22 23:32 ` patchwork-bot+linux-riscv
2024-05-22 23:51 ` patchwork-bot+linux-riscv
2024-05-23 3:45 ` Masahiro Yamada
2024-05-23 11:59 ` Michael Ellerman [this message]
2024-05-24 5:06 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ed9s3fjg.fsf@mail.lhotse \
--to=mpe@ellerman.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=masahiroy@kernel.org \
--cc=palmer@rivosinc.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox