[parisc-linux] CVS linux Vs. -test10
Grant Grundler
grundler@cup.hp.com
Mon, 20 Nov 2000 09:34:31 -0800
Matthew Wilcox wrote:
...
> sounds right. MMIO should work now though, right?
It would have worked then too.
Changing it to use MMIO space would require disabling I/O Port space
by defining inb/outb locally to use gsc_readb/writeb.
My problem with doing that was the semantics are slightly different.
I/O Port space is non-postable and MMIO space is. I wasn't confident
a driver written to use I/O port space would work right under MMIO
though some certainly do.
...
> it was definitely a 32-bit kernel at the time. It might be the same bug,
> but I'm not sure.
Can't be. AP (%r29) is a 64-bit only construct.
dhd also just confirmed it was 32-bit kernel.
I'll try it now.
...
> > We need to resolve this in order to merge upstream.
> > Matthew, any advice on how we should proceed?
> > Or would be easier for you pester Alan Cox and just get it fixed?
>
> Hm. Alan's not hacking on 2.4, last I heard. I might pester Linus and
> see if we can change that. It's a mechanical change so he might not be
> averse to it at this point. Bear in mind we don't need to do a complete
> merge at this point -- most architectures have a separate patch to apply
> on top of Linus' tree.
Ok. What's the first step to getting arch/parisc* and include/asm-parisc*
into Linus's tree?
I had dinner with Bdale Garbee last night and one of two things he made
clear was we need to unfork from debian and linus's tree in order to move
forward. All our CVS branches need to become obsolete or "local sandboxes"
of the respective upstream partners. Feeding kernel bits upstream will
bring a new level of visibility (and *HELP*) to the parisc-linux port.
I totally agree with Bdale. I understand alot of work still needs to
happen in our tree (eg though sba_iommu.c works, it's current form sucks)
But pushing bits upstream to linus will not preclude us from doing that work.
I also find it odd that glibc is merged upstream *before* the kernel is.
For the record, the second issue bdale made clear was we need "boot
floppies" debian package working. We don't need more ISO images (no
offense to pjlahaie for his good work). "Boot floppies" is a pre-requisite
to becoming part of the next debian release. Given I still don't have
a clue how to build a debian package and I can still contribute alot
in other areas, it doesn't make sense for me to do it myself.
> > I'd be happy to fix this by clobbering the current version with what's in
> > linux-2.4.0-test10. But what is the "right" way to revert changes we've made
> > so this doesn't show up in next merge?
>
> I don't know that there's an official way to do this. I always changed
> the file to its previous state and then committed it. There are a number of
> ways of doing it; perhaps the cleanest is:
>
> cvs diff -r1.4 -r1.5 fs/nfs/read.c >../read.c.diff
> (then check the read.c.diff file)
> patch -p1 <../read.c.diff
> rm ../read.c.diff
>
> or you can just delete the lines yourself. Use diff to make sure there
> aren't any silly cosmetic changes (eg whitespace).
The part you described above is the easy part - np.
I'm worried about labels and tracking how we "name" the releases.
Mang or other CVS ninja's care to comment?
thanks,
grant
Grant Grundler
Unix Systems Enablement Lab
+1.408.447.7253