Re: [GIT PULL] RCU changes for v5.5

[Ingo Molnar]

* Ingo Molnar <mingo@xxxxxxxxxx> wrote:

> Linus,
> 
> Please pull the latest core-rcu-for-linus git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-rcu-for-linus
> 
>    # HEAD: 43e0ae7ae0f567a3f8c10ec7a4078bc482660921 Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

>  kernel/workqueue.c                                 |   10 +-

Merge conflict note, the following commit from the RCU tree:

  5a6446626d7e: ("workqueue: Convert for_each_wq to use built-in list check")

... will conflict with the following commit from the workqueue tree, 
which you already pulled:

  49e9d1a9faf2: ("workqueue: Add RCU annotation for pwq list walk")

The merge conflict was also noted by Stephen:

  https://lore.kernel.org/r/20191118150858.1a436a12@xxxxxxxxxxxxxxxx

The correct resolution is to pick the 5a6446626d7e side, as it's the 
latest, best variant of this iteration - you can find this resolution in 
tip:master as well.

Thanks,

	Ingo