Re: linux-next: duplicate patches in the rcu tree

[Steven Rostedt]

On Wed, 27 Sep 2023 11:53:30 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi all,
> 
> The following commits are also in the ftrace tree as different commits
> (but similar patches):
> 
>   8f2612479c71 ("doc: Add /proc/bootconfig to proc.rst")

This one looks like it has some whitespace issues (according to git show).

>   648c895fda8d ("doc: Update /proc/cmdline documentation to include boot config")
> 
> These are commits
> 
>   5f4028880652 ("doc: Add /proc/bootconfig to proc.rst")
>   6eab72b5fea3 ("doc: Update /proc/cmdline documentation to include boot config")
> 
> in the ftrace tree.  They are causing a conflict due to the differences.
> 
> I am guessing that the commits in the ftrace tree are an older verison?
> 

It looks like the commits in the for-next branch were nacked by Linus due
to a commit in between the above two.

  https://lore.kernel.org/all/CAHk-=wjpVAW3iRq_bfKnVfs0ZtASh_aT67bQBG11b4W6niYVUw@xxxxxxxxxxxxxx/

Masami, can you update your for-next bootconfig branch? If Paul is taking
the patches, I'm guessing we can just drop them.

Thanks,

-- Steve