linux-kernel - Re: linux-next: manual merge of the pm tree with the kbuild 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: <1790706.irnnyc2D39@aspire.rjw.lan>
Date:   Fri, 21 Dec 2018 11:59:44 +0100
From:   "Rafael J. Wysocki" <rjw@...ysocki.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Sinan Kaya <okaya@...nel.org>, Christoph Hellwig <hch@....de>
Subject: Re: linux-next: manual merge of the pm tree with the kbuild tree

On Friday, December 21, 2018 2:59:45 AM CET Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   arch/arm64/Kconfig
> 
> between commits:
> 
>   2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options")
>   20f1b79d3359 ("PCI: consolidate the PCI_SYSCALL symbol")
> 
> from the kbuild tree and commit:
> 
>   52146173a033 ("arm64: select ACPI PCI code only when both features are enabled")
> 
> from the pm 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, thank you!