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

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20191126081019.GA98591@gmail.com>
Date:   Tue, 26 Nov 2019 09:10:19 +0100
From:   Ingo Molnar <mingo@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Tejun Heo <tj@...nel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Paul E. McKenney" <paulmck@...nel.org>,
        Peter Zijlstra <a.p.zijlstra@...llo.nl>,
        Thomas Gleixner <tglx@...utronix.de>,
        Andrew Morton <akpm@...ux-foundation.org>,
        linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] RCU changes for v5.5


* Ingo Molnar <mingo@...nel.org> 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@canb.auug.org.au

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