linux-kernel - Re: linux-next: manual merge of the pm tree with Linus' 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: <4227495.5k86JKlag9@vostro.rjw.lan>
Date:	Mon, 09 Nov 2015 01:46:01 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marc Zyngier <marc.zyngier@....com>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	"Suthikulpanit, Suravee" <Suravee.Suthikulpanit@....com>
Subject: Re: linux-next: manual merge of the pm tree with Linus' tree

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/