Received-SPF: pass (google.com: domain of linux-kernel+bounces-188325-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <mhng-e73e59bf-92fc-4122-9f9e-a329d20eba55@palmer-ri-x1c9>
 <CAK7LNASVhbtJ2=72TsCu1C7+uLsXySNffPcNZU2NiFKitM6-Ew@mail.gmail.com> <87ed9s3fjg.fsf@mail.lhotse>
In-Reply-To: <87ed9s3fjg.fsf@mail.lhotse>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Fri, 24 May 2024 14:06:52 +0900
Message-ID: <CAK7LNAQbHVR2r1YdWCiTg+Tp29uJZyZv2nghFsrUoKszFP-UdQ@mail.gmail.com>
Subject: Re: [GIT PULL] RISC-V Patches for the 6.10 Merge Window, Part 1
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@rivosinc.com>, Linus Torvalds <torvalds@linux-foundation.org>, 
	linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, May 23, 2024 at 8:59=E2=80=AFPM Michael Ellerman <mpe@ellerman.id.a=
u> wrote:
>
> Masahiro Yamada <masahiroy@kernel.org> writes:
> > On Thu, May 23, 2024 at 1:13=E2=80=AFAM Palmer Dabbelt <palmer@rivosinc=
com> wrote:
> >>
> >> The following changes since commit 4cece764965020c22cff7665b18a0120063=
59095:
> >>
> >>   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/r=
iscv-for-linus-6.10-mw1
> >>
> >> for you to fetch changes up to 92cce91949a497a8a4615f9ba5813b03f7a1f1d=
5:
> >>
> >>   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=3Dfuller -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@ke=
rnel.org
>     Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
>
> Or via:
>
> $ git log --oneline -2 92cce91949a497a8a4615f9ba5813b03f7a1f1d5 origin/ma=
ster -- include/asm-generic/export.h
> 0316e4b04e01 export.h: remove include/asm-generic/export.h
> 36d37f11f555 export.h: remove include/asm-generic/export.h
>
> cheers
>


OK, thanks.
I think I was misunderstanding the effect of "git log -- <path>"


When "-- include/asm-generic" is passed, 36d37f11f555 is hidden.


$ git log --oneline --author=3DMasahiro | grep include/asm-generic/export.h
0316e4b04e01 export.h: remove include/asm-generic/export.h
36d37f11f555 export.h: remove include/asm-generic/export.h


$ git log --oneline --author=3DMasahiro -- include/asm-generic/ | grep
include/asm-generic/export.h
0316e4b04e01 export.h: remove include/asm-generic/export.h


"man git-log" explains why:


<path>...
  Show only commits that are enough to explain how the files that match the
  specified paths came to be. See History Simplification below for details
  and other simplification modes.


--=20
Best Regards
Masahiro Yamada