| 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
| ||
|
Message-ID: <20130815153148.579ad2e5@skate>
Date: Thu, 15 Aug 2013 15:31:48 +0200
From: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jason Cooper <jason@...edaemon.net>, <andrew@...n.ch>,
<gregory.clement@...e-electrons.com>,
<linux-arm-kernel@...ts.infradead.org>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, Bjorn Helgaas <bhelgaas@...gle.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Subject: Re: linux-next: manual merge of the mvebu tree with the pci tree
Dear Stephen Rothwell,
On Wed, 14 Aug 2013 16:18:40 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make
> Marvell PCIe driver depend on OF") from the pci tree and commit
> 31d896ade95d ("PCI: mvebu: add support for Marvell Dove SoCs") from the
> mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Your fix seems correct to me.
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
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/
Powered by blists - more mailing lists