Re: [GIT PULL] RISC-V Patches for the 6.10 Merge Window, Part 1

[Michael Ellerman]

Masahiro Yamada <masahiroy@xxxxxxxxxx> writes:
> On Thu, May 23, 2024 at 1:13 AM Palmer Dabbelt <palmer@xxxxxxxxxxxx> 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@xxxxxxxxxx>
AuthorDate: Sat Mar 23 18:06:15 2024 +0900
Commit:     Palmer Dabbelt <palmer@xxxxxxxxxxxx>
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@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240323090615.1244904-1-masahiroy@xxxxxxxxxx
    Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>

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