From: Chris Metcalf <cmetcalf@tilera.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Yinghai Lu <yinghai@kernel.org>
Subject: Re: [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c
Date: Wed, 25 Jul 2012 18:45:29 -0400 [thread overview]
Message-ID: <50107709.2000301@tilera.com> (raw)
In-Reply-To: <CAErSpo7P4jCw=gTDR3JabY1F46xWiTF6ru90T86NzuT7Pxu1_A@mail.gmail.com>
On 7/25/2012 5:16 PM, Bjorn Helgaas wrote:
> On Wed, Jul 25, 2012 at 1:40 PM, Chris Metcalf <cmetcalf@tilera.com> wrote:
>> > Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
>> > the tile-next changes to add tilegx PCI support don't build. This
>> > was expected (seen in linux-next) and this one-line fix is along
>> > the same lines as commit b918c62e for all other architectures.
>> >
>> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
>
> You pushed the other tile changes, so I assume you'll do the same with
> this one.
I will, thanks!
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
prev parent reply other threads:[~2012-07-25 22:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 19:40 [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c Chris Metcalf
2012-07-25 21:16 ` Bjorn Helgaas
2012-07-25 22:45 ` Chris Metcalf [this message]
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=50107709.2000301@tilera.com \
--to=cmetcalf@tilera.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=yinghai@kernel.org \
/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.