linux-next: duplicate patches in the rcu tree

linux-next: duplicate patches in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  56544e22cc3a ("fs/proc: remove redundant comments from /proc/bootconfig")
  e6f3a323fcfa ("fs/proc: Skip bootloader comment if no embedded kernel paramete

These are commits

  fbbdc255fbee ("fs/proc: remove redundant comments from /proc/bootconfig")
  c722cea20878 ("fs/proc: Skip bootloader comment if no embedded kernel parameters")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Paul E. McKenney]

On Thu, Apr 11, 2024 at 04:46:55PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   56544e22cc3a ("fs/proc: remove redundant comments from /proc/bootconfig")
>   e6f3a323fcfa ("fs/proc: Skip bootloader comment if no embedded kernel paramete
> 
> These are commits
> 
>   fbbdc255fbee ("fs/proc: remove redundant comments from /proc/bootconfig")
>   c722cea20878 ("fs/proc: Skip bootloader comment if no embedded kernel parameters")
> 
> in Linus' tree.

Very good!!!  I will remove them from -rcu.

							Thanx, Paul

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

[Paul E. McKenney]

On Mon, Oct 02, 2023 at 11:41:16AM -0400, Steven Rostedt wrote:
> On Wed, 27 Sep 2023 11:53:30 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> 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@mail.gmail.com/
> 
> Masami, can you update your for-next bootconfig branch? If Paul is taking
> the patches, I'm guessing we can just drop them.

I finally got my act together and send out the new series, apologies
for the delay!

This should become visible here in the due course of events:

https://lore.kernel.org/lkml/6ea609a4-12e3-4266-8816-b9fca1f1f21c@paulmck-laptop/

							Thanx, Paul

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

[Steven Rostedt]

On Wed, 27 Sep 2023 11:53:30 +1000
Stephen Rothwell <sfr@canb.auug.org.au> 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@mail.gmail.com/

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

linux-next: duplicate patches in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Paul E. McKenney]

On Tue, Jan 24, 2023 at 12:01:07PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the pm tree as different commits
> (but the same patches):
> 
>   ba66764b5e43 ("kernel/power: Remove "select SRCU"")
>   e5ded8e65e70 ("drivers/cpufreq: Remove "select SRCU"")
> 
> Thesea are also commits
> 
>   52e0452b413d ("PM: sleep: Remove "select SRCU"")
>   38a29e5834eb ("drivers/cpufreq: Remove "select SRCU"")
> 
> in the pm tree.

My tests passed, so I have now pushed out an rcu/next branch with
these commits dropped from -rcu.  Apologies for the hassle!

							Thanx, Paul

linux-next: duplicate patches in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

Hi all,

The following commits are also in the pm tree as different commits
(but the same patches):

  ba66764b5e43 ("kernel/power: Remove "select SRCU"")
  e5ded8e65e70 ("drivers/cpufreq: Remove "select SRCU"")

Thesea are also commits

  52e0452b413d ("PM: sleep: Remove "select SRCU"")
  38a29e5834eb ("drivers/cpufreq: Remove "select SRCU"")

in the pm tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Paul E. McKenney]

On Fri, Jan 06, 2023 at 11:56:56AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in other trees included in linux-next as
> different commits (but the same patches):
> 
>   5ae8fe77d8fe ("block: Remove "select SRCU"")
>   5707ec3b444f ("fs/dlm: Remove "select SRCU"")
> 
> The first is in the block tree and the second is in the dlm tree.

Very good!

I have dropped these from the -rcu tree, and if testing goes well they
will also be gone from the rcu/next branch.  (One never gets to make
only two changes...)

							Thanx, Paul

linux-next: duplicate patches in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

Hi all,

The following commits are also in other trees included in linux-next as
different commits (but the same patches):

  5ae8fe77d8fe ("block: Remove "select SRCU"")
  5707ec3b444f ("fs/dlm: Remove "select SRCU"")

The first is in the block tree and the second is in the dlm tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]