From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jason Cooper <jason@lakedaemon.net>,
andrew@lunn.ch, gregory.clement@free-electrons.com,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: Re: linux-next: manual merge of the mvebu tree with the pci tree
Date: Thu, 15 Aug 2013 15:31:48 +0200 [thread overview]
Message-ID: <20130815153148.579ad2e5@skate> (raw)
In-Reply-To: <20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au>
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
WARNING: multiple messages have this Message-ID (diff)
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the mvebu tree with the pci tree
Date: Thu, 15 Aug 2013 15:31:48 +0200 [thread overview]
Message-ID: <20130815153148.579ad2e5@skate> (raw)
In-Reply-To: <20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au>
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
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jason Cooper <jason@lakedaemon.net>, <andrew@lunn.ch>,
<gregory.clement@free-electrons.com>,
<linux-arm-kernel@lists.infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: Re: linux-next: manual merge of the mvebu tree with the pci tree
Date: Thu, 15 Aug 2013 15:31:48 +0200 [thread overview]
Message-ID: <20130815153148.579ad2e5@skate> (raw)
In-Reply-To: <20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au>
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
next prev parent reply other threads:[~2013-08-15 13:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 6:18 linux-next: manual merge of the mvebu tree with the pci tree Stephen Rothwell
2013-08-14 6:18 ` Stephen Rothwell
2013-08-14 6:18 ` Stephen Rothwell
2013-08-15 13:31 ` Thomas Petazzoni [this message]
2013-08-15 13:31 ` Thomas Petazzoni
2013-08-15 13:31 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2013-08-14 6:22 Stephen Rothwell
2013-08-14 6:22 ` Stephen Rothwell
2013-08-14 6:22 ` Stephen Rothwell
2013-08-14 13:05 ` Jason Cooper
2013-08-14 13:05 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130815153148.579ad2e5@skate \
--to=thomas.petazzoni@free-electrons.com \
--cc=andrew@lunn.ch \
--cc=bhelgaas@google.com \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.