lkml.org 
[lkml]   [2018]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the pm tree with the kbuild tree
Date
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!

\
 
 \ /
  Last update: 2018-12-21 12:00    [W:0.034 / U:2.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site