Re: [PATCH] pci: fix merging left out for BAR print out v2

[Ingo Molnar]

* Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote:

> On Wednesday, September 10, 2008 11:08 am Ingo Molnar wrote:
> > * Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote:
> > > On Wednesday, September 10, 2008 1:44 am Ingo Molnar wrote:
> > > > * Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
> > > > > print out for Device BAR address before kernel try to update them.
> > > > >
> > > > > also change it to KERN_DEBUG instead...
> > > > >
> > > > > v2: update to linux-pci next
> > > > >    also add (unsigned long long) cast
> > > > >
> > > > > Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
> > > >
> > > > Jesse, if you want to pick it up, could we please do this via git
> > > > methods (git-pull and stuff)? The commit below is the one in -tip -
> > > > should i separate it out?
> > >
> > > Sure, though I'm not sure why I shouldn't just be applying this stuff
> > > to my tree first... Seems weird to pull from you only to then ask
> > > Linus to pull.
> >
> > sure - it's just that it all happened weeks ago so it's intermixed. As
> > long as you dont mind the duplicate commit (git will sort it out fine)
> > we can apply it to both trees.
> 
> Ah I see, sure I can pull your bits.  /me gets out his breadcrumbs in 
> preparation for entering the x86 forest.  Does your -tip just contain 
> stuff you're sending to Linus for 2.6.27?

no, the .27 buckets of -tip are almost completely emptied - we are in 
the final stages of .27 stabilization. -tip includes all the v2.6.28 
bits. (which this patch would be too IMHO)

anyway, there's no big issue here i think, upstream -git is fine i 
think, please apply the patch to your tree (it only changes printouts), 
it should not cause any big conflicts.

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