linux-next: duplicate patches in the rcu tree

[Stephen Rothwell]

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

Attachment: pgpBiTcg5zXVj.pgp
Description: OpenPGP digital signature