From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Williams Subject: Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2 Date: Mon, 22 Mar 2010 08:32:35 +1000 Message-ID: <1d3f23371003211532p57fe0785s5960ddea8218d4d4@mail.gmail.com> References: <4B98F32D.8020906@monstr.eu> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: Grant Likely Cc: devicetree-discuss , Linus Torvalds , LKML List-Id: devicetree@vger.kernel.org Grant, On Sun, Mar 21, 2010 at 3:35 AM, Grant Likely w= rote: > On Thu, Mar 11, 2010 at 6:42 AM, Michal Simek 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. =A0At the very least I would have > expected a reply back from you telling me that you disagree and that > you wanted to merge anyway. =A0I 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