Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 14 Jul 2023 17:31:26 +0900
From:   Masami Hiramatsu (Google) <mhiramat@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Steven Rostedt <rostedt@goodmis.org>,
        Akanksha J N <akanksha@linux.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shuah Khan <shuah@kernel.org>
Subject: Re: linux-next: duplicate patches in the ftrace tree
Message-Id: <20230714173126.37313c540cc998f5653a6848@kernel.org>
In-Reply-To: <20230714145404.115c7be1@canb.auug.org.au>
References: <20230714145404.115c7be1@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

Thanks for the caution!

On Fri, 14 Jul 2023 14:54:04 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   e46ad59233cf ("selftests/ftrace: Add new test case which checks for optimized probes")
>   bd2cdc432190 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")

These are only in next-20230714.

> 
> These are commits
> 
>   5985329c7073 ("selftests/ftrace: Add new test case which checks for optimized probes")
>   cf9071dd46e7 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")

I confirmed the latter pair was pushed by my probes-v6.5.
So the latter one should be kept.

Ah, sorry, I missed to update probes/for-next. That caused this issue.
Let me update the probes/for-next branch.

Thank you,

> 
> in Linus' tree.
> 
> -- 
> Cheers,
> Stephen Rothwell


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>