linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20190703130439.GR9224@smile.fi.intel.com>
Date:   Wed, 3 Jul 2019 16:04:39 +0300
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Suzuki K Poulose <suzuki.poulose@....com>
Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree

On Mon, Jul 01, 2019 at 06:32:49PM +1000, Stephen Rothwell wrote:
> 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.

Thank you, the fix looks correct!

> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
With Best Regards,
Andy Shevchenko