* Re: powerpc/pci: Make both ppc32 and ppc64 use sysdata for pci_controller
[not found] ` <AANLkTikgG5JHimq5a2OsgsH+z+WsHO3MO6OU1q6_DzgH@mail.gmail.com>
@ 2011-03-21 18:31 ` Grant Likely
0 siblings, 0 replies; only message in thread
From: Grant Likely @ 2011-03-21 18:31 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Linus Torvalds, Linux Kernel Mailing List, linuxppc-dev, Hugh Dickins
[reposting part of private email exchange as penance for my sins...]
On Mon, Mar 21, 2011 at 12:22 PM, Grant Likely
<grant.likely@secretlab.ca> wrote:
> On Sun, Mar 20, 2011 at 4:52 PM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
>> Grant, what in hell makes you believe that this patch was ok to
>> merge upstream without even my Ack ?
>>
>> Yes, I told you I agree with the -principle-, but I also need to -test-
>> and review it properly which I haven't had a chance to do (and it does
>> break G5s at least it seems from the reports we are getting). In any
>> case this is clearly -NOT- within the boundaries of your devicetree
>> "tree" and should have gone through powerpc-next.
>
> Sorry Ben, I did not intend to merge that patch. Quite simply I
> accidentally included it in my devicetree/next branch when I pushed
> out a bunch of other PCI related patches in February, and I overlooked
> that it was still in there when I sent Linus the pull request. It was
> a complete failure on my part. I apologize and submit myself for the
> required flogging.
A flogging schedule will be posted on the bulletin board in the lunch
room. Sorry for the trouble.
g.
^ permalink raw reply [flat|nested] only message in thread