Re: linux-next: duplicate patches in the risc-v tree

[Samuel Holland]

On 10/30/23 13:15, Palmer Dabbelt wrote:
> On Sun, 29 Oct 2023 13:56:29 PDT (-0700), Stephen Rothwell wrote:
>> Hi all,
>>
>> The following commits are also in Linus Torvalds' tree as different
>> commits (but the same patches):
>>
>>   767423658d53 ("riscv: kexec: Align the kexeced kernel entry")
>>   fe2ed36d419f ("riscv: Remove duplicate objcopy flag")
> 
> Sorry, but I'm lost here -- I'm not sure if I've managed to screw up git
> again?  If it helps, I'm not seeing the same commits here:

Each of these commits (separately) is a duplicate of a commit in Linus's
tree:

$ git range-diff v6.6...riscv/for-next | grep -v ' [<>] '
1441:  505b02957e74 !    2:  fe2ed36d419f riscv: Remove duplicate objcopy flag
    @@ Commit message
     
         Fixes: c0fbcd991860 ("RISC-V: Build flat and compressed kernel images")
         Signed-off-by: Song Shuai <songshuaishuai@xxxxxxxxxxx>
    -    Reviewed-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
         Link: https://lore.kernel.org/r/20230914091334.1458542-1-songshuaishuai@xxxxxxxxxxx
    -    Cc: stable@xxxxxxxxxxxxxxx
         Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
     
      ## arch/riscv/Makefile ##
 297:  1bfb2b618d52 !    4:  767423658d53 riscv: kexec: Align the kexeced kernel entry
    @@ Commit message
     
         Fixes: 8acea455fafa ("RISC-V: Support for kexec_file on panic")
         Signed-off-by: Song Shuai <songshuaishuai@xxxxxxxxxxx>
    -    Link: https://lore.kernel.org/r/20230906095817.364390-1-songshuaishuai@xxxxxxxxxxx
    +    Link: https://lore.kernel.org/r/20230907103304.590739-3-songshuaishuai@xxxxxxxxxxx
         Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
     
      ## arch/riscv/kernel/elf_kexec.c ##