linux-kernel - Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1d3f23371003211532p57fe0785s5960ddea8218d4d4@mail.gmail.com>
Date:	Mon, 22 Mar 2010 08:32:35 +1000
From:	John Williams <john.williams@...alogix.com>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	monstr@...str.eu, Linus Torvalds <torvalds@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>,
	devicetree-discuss <devicetree-discuss@...ts.ozlabs.org>
Subject: Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2

Grant,

On Sun, Mar 21, 2010 at 3:35 AM, Grant Likely <grant.likely@...retlab.ca> wrote:
> On Thu, Mar 11, 2010 at 6:42 AM, Michal Simek <monstr@...str.eu> wrote:
>> Hi Linus,
>>
>> Please pull Microblaze changes to your tree. There is support for PCI and
>> new DMA interface.
>>
>> Thanks,
>> Michal
>
> Hi Michal.
>
> I'm really unimpressed that you've merged the cloned PCI support code
> when we talked about merging the common powerpc & microblaze bits
> /before/ pushing it up to mainline.  At the very least I would have
> expected a reply back from you telling me that you disagree and that
> you wanted to merge anyway.  I didn't even get a reply back form you
> when I asked about why the PCI bits were in your linux-next branch.
>
> Now it needs to be merged in-place which is a lot more work.

You should blame me for this one.  There was nothing deliberate about
it - I've been hassling Michal to get the DMA API upstream because
there's other work that depends on it, and with everything else going
on I plain forgot that his patchset included the PCI stuff that we
were still discussing with you.

Let me buy you a beer at ELC and you can berate me for it then!

John
--
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/