lkml.org 
[lkml]   [2015]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the pm tree with Linus' tree
Date
On Monday, November 09, 2015 10:45:12 AM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/of/of_pci.c
> include/linux/of_pci.h
>
> between commits:
>
> f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only"")
>
> from Linus' tree and commit:
>
> 50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks a lot for taking care of this!

Rafael



\
 
 \ /
  Last update: 2015-11-09 01:41    [W:0.036 / U:1.392 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site