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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230927115330.69ef6671@canb.auug.org.au>
Date:   Wed, 27 Sep 2023 11:53:30 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Paul E. McKenney" <paulmck@...nel.org>,
        Steven Rostedt <rostedt@...dmis.org>,
        Masami Hiramatsu <mhiramat@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: duplicate patches in the rcu tree

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")
  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?

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped