From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: kernel-janitors@vger.kernel.org
Subject: Re: [pci:pci/gavin-window-alignment 5/5] arch/powerpc/platforms/powernv/pci-ioda.c:1164:3: error: im
Date: Wed, 12 Sep 2012 23:27:59 +0000 [thread overview]
Message-ID: <1347492479.2276.16.camel@pasglop> (raw)
In-Reply-To: <20120911224842.GA11618@localhost>
On Tue, 2012-09-11 at 17:09 -0600, Bjorn Helgaas wrote:
> Sorry, this is my fault. I fixed this earlier, but I did it the wrong
> way.
>
> What I did before was just update the patch in the
> pci/gavin-window-alignment branch. But what I should have done was to
> rebase that branch on top of pci/jiang-pcie-cap, which the branch it
> actually depends on (that's where pci_pcie_type() was added).
>
> So I did that rebase and pushed both pci/gavin-window-alignment and
> next again. I think the result is sensible now.
The result has content conflicts against a couple of drivers. If I fix
that up locally that means that things might end up being a bit more
complicated than expected when reconciling everything with Linus and
that worries me.
Any chance you can pull in a recent Linus tree & fixup the merges before
I pull that in myself ?
Cheers,
Ben.
next prev parent reply other threads:[~2012-09-12 23:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 22:48 [pci:pci/gavin-window-alignment 5/5] arch/powerpc/platforms/powernv/pci-ioda.c:1164:3: error: implic Fengguang Wu
2012-09-11 23:09 ` [pci:pci/gavin-window-alignment 5/5] arch/powerpc/platforms/powernv/pci-ioda.c:1164:3: error: im Bjorn Helgaas
2012-09-11 23:44 ` Benjamin Herrenschmidt
2012-09-12 23:27 ` Benjamin Herrenschmidt [this message]
2012-09-13 14:49 ` Bjorn Helgaas
2012-09-13 21:35 ` Benjamin Herrenschmidt
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=1347492479.2276.16.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=kernel-janitors@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).