linux-kernel - linux-next: manual merge of the driver-core tree with the pm 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-next>] [day] [month] [year] [list]

Message-ID: <20190701183249.34c928ce@canb.auug.org.au>
Date:   Mon, 1 Jul 2019 18:32:49 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Suzuki K Poulose <suzuki.poulose@....com>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: linux-next: manual merge of the driver-core tree with the pm tree

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/acpi/sleep.c

between commit:

  a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()")

from the pm tree and commit:

  418e3ea157ef ("bus_find_device: Unify the match callback with class_find_device")

from the driver-core tree.

I fixed it up (the former removed the code modified by the latter) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped