linux-kernel - Re: linux-next: manual merge of the driver-core tree with 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com>
Date:   Tue, 13 Aug 2019 10:50:05 +0200
From:   "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>,
        "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Joel Fernandes (Google)" <joel@...lfernandes.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the rcu
 tree

On 8/13/2019 7:50 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
>    drivers/base/power/runtime.c
>
> between commit:
>
>    4a3a5474b4c1 ("driver/core: Convert to use built-in RCU list checking")
>
> from the rcu tree and commit:
>
>    515db266a9da ("driver core: Remove device link creation limitation")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
The fix looks good to me, thanks!