Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Feedback-ID: i0ad843c9:Fastmail
Message-ID: <e63664ce-de35-7072-c081-9191df89d5f4@sholland.org>
Date:   Mon, 30 Oct 2023 14:42:56 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux ppc64le; rv:102.0) Gecko/20100101
 Thunderbird/102.14.0
From:   Samuel Holland <samuel@sholland.org>
Subject: Re: linux-next: duplicate patches in the risc-v tree
To:     Palmer Dabbelt <palmer@dabbelt.com>
Cc:     Paul Walmsley <paul@pwsan.com>, linux-kernel@vger.kernel.org,
        linux-next@vger.kernel.org, Stephen Rothwell <sfr@canb.auug.org.au>
References: <mhng-b6345abb-81b3-450c-ae11-deed854821dc@palmer-ri-x1c9a>
Content-Language: en-US
In-Reply-To: <mhng-b6345abb-81b3-450c-ae11-deed854821dc@palmer-ri-x1c9a>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

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@tinylab.org>
    -    Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
         Link: https://lore.kernel.org/r/20230914091334.1458542-1-songshuaishuai@tinylab.org
    -    Cc: stable@vger.kernel.org
         Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
     
      ## 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@tinylab.org>
    -    Link: https://lore.kernel.org/r/20230906095817.364390-1-songshuaishuai@tinylab.org
    +    Link: https://lore.kernel.org/r/20230907103304.590739-3-songshuaishuai@tinylab.org
         Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
     
      ## arch/riscv/kernel/elf_kexec.c ##