Re: [PATCH 5/13] EDAC mpc85xx fix pci ofdev

[Doug Thompson]

--- Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:

> On Fri, 27 Jun 2008 20:53:35 -0700 (PDT) Doug Thompson <norsk5@xxxxxxxxx> wrote:
> 
> > 
> > --- Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> > 
> > > On Fri, 27 Jun 2008 12:13:13 -0600
> > > dougthompson@xxxxxxxxxxxx wrote:
> > > 
> > > > From:	Dave Jiang <djiang@xxxxxxxxxx>
> > > > 
> > > > Applied to linux-2.6.26-rc5-mm3
> > > > 
> > > > Converting PCI err device from platform to open firmware of_dev to comply with
> > > > powerpc schemes.
> > > 
> > > This one doesn't apply due to later changes which should be in 2.6.26-rc8.
> > > 
> > 
> > 
> > mmm, doesn't apply to the -mm3?  
> > 
> > I knew it didn't apply to the 2.6.26-rc5 because there was a patch in the -mm3 which modified
> the
> > same code. I assumed that patch would remain in the -mm tree until 2.6.27, therefore I didn't
> try
> > the -rc8 code base.  
> > 
> > I applied it 3 times to different 2.6.26-rc5-mm3 trees. The first time there was a problem,
> but
> > did new 2.6.26-rc5 trees with a -mm3 and the last 2 times it worked. That puzzled me.
> > 
> > interesting.
> 
> I suspect there was gregstuff in rc5-mm3 which got dropped later on so
> I don't have it any more.
> 
> > ok will resubmit later when we get a newer -mm update
> 
> Against 2.6.26-rc8 will work.
>

Nope, it failed also. It looks like the reject I got when I tried it on bare 2.6.26-rc5. There was
a patch in -mm3 on EDAC that modified multiple of the following code:

pdev->dev.bus_id references to a dev_name(&pdev->dev)

-mm3 is what dave used for his basis.

Since the -rc5-mm3 patch was broken (the kernel OOPs), I extracted the EDAC patch from that into a
simple patch I applied to -rc5 and then applied my patch set and run that kernel to verify it
worked. I just applied that same mini-mm patch to -rc8 and Dave's patch applied fine. Without that
mini-mm3 patch, it work apply

doug t


W1DUG
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/