[parisc-linux] [MERGE] trouble files

[parisc-linux] [MERGE] trouble files

[willy]

the following list of files (if I remember to attach them this time...)
are the files which have been modified in both the parisc tree and Linus'
2.3.99pre8 tree.  I've omitted the files where the rcs id is the only thing
changed.

Tulip is special because we're using 2.3.99pre3's driver in the pre1 tree.
So the files which differe from pre3 are these:

drivers/net/tulip/eeprom.c
drivers/net/tulip/tulip_core.c

The following files should definitely just be overwritten:

Documentation/DMA-mapping.txt
drivers/net/pcnet32.c

the rest will require closer scrutiny on Friday.  From an initial
examination, it's not going to be too painful.  I propose we close
the tree for new checkins midnight Thursday GMT (7pm EST, 4pm PST).
After that, I guess we'll lay down a tag and start merging in 2.3.99pre8
files and then lay down another tag when we're done.  mang, will you be
around to assist us with the merge?


CREDITS
Makefile
drivers/block/rd.c
drivers/char/Config.in
drivers/char/Makefile
drivers/char/console.c
drivers/char/serial.c
drivers/net/82596.c
drivers/net/Makefile
drivers/net/Space.c
drivers/net/eepro100.c
drivers/pci/pci.c
drivers/pci/pci.ids
drivers/scsi/Makefile
drivers/scsi/hosts.c
drivers/scsi/script_asm.pl
drivers/scsi/scsi_obsolete.c
drivers/scsi/sym53c8xx_defs.h
drivers/sound/Config.in
drivers/sound/Makefile
drivers/video/Makefile
fs/Makefile
fs/exec.c
fs/nfs/nfsroot.c
include/linux/binfmts.h
include/linux/pci.h
include/linux/pci_ids.h
include/linux/string.h
include/linux/tty.h
include/linux/udf_fs_sb.h
include/linux/ufs_fs.h
init/main.c
kernel/exit.c
kernel/fork.c
kernel/printk.c
lib/string.c
mm/slab.c

Re: [parisc-linux] [MERGE] trouble files

[Michael Ang]

I'll be available to help, but won't have a machine to test on.  I just
got a souped up 712 (thanks to the Fort Collins crew!), but haven't
scrounged up the required cables yet.

	- Mike.

willy@thepuffingroup.com wrote:
> 
> I propose we close
> the tree for new checkins midnight Thursday GMT (7pm EST, 4pm PST).
> After that, I guess we'll lay down a tag and start merging in 2.3.99pre8
> files and then lay down another tag when we're done.  mang, will you be
> around to assist us with the merge?

Re: [parisc-linux] [MERGE] trouble files

[Richard Hirst]

On Tue, May 23, 2000 at 08:07:50PM -0400, willy@thepuffingroup.com wrote:
> 
> the following list of files (if I remember to attach them this time...)
> are the files which have been modified in both the parisc tree and Linus'
> 2.3.99pre8 tree.  I've omitted the files where the rcs id is the only thing
> changed.

> drivers/net/82596.c

I don't believe we use that; I guess we started modifying it and then
created our own lasi_82596.c from it.  I'll check if anything that
changed in 82596.c needs feeding back in to lasi_82596.c.

Richard

Re: [parisc-linux] [MERGE] trouble files

[willy]

On Thu, May 25, 2000 at 09:35:30AM +0100, Richard Hirst wrote:
> > drivers/net/82596.c
> 
> I don't believe we use that; I guess we started modifying it and then
> created our own lasi_82596.c from it.  I'll check if anything that
> changed in 82596.c needs feeding back in to lasi_82596.c.

Helge already mailed me to inform me we can lose all our current
modifications to that file.  You don't need to check it; thanks for
noticing :-)

Re: [parisc-linux] [MERGE] trouble files

[Grant Grundler]

Mathew (and others),

I'm posting these comments so the same files don't get done twice.
And I think someone who has clue could do me a favor and submit
a patch to linus for a few minor things. So far, this merge looks
pretty easy.

...
drivers/char/Config.in
	Added CONFIG_GSC_LASI support for serial console support.

drivers/char/Makefile
	Added CONFIG_GSC_PS2 (gsc_ps2.o keyb_at.o) support
	Added CONFIG_HIL support

drivers/char/console.c
	Not sure we want the mod to vt_console_device().
	Seems we end up invoking MKDEV() twice.

	TODO:
	a) Need to add #ifdef __hppa__ (or something) around
	  "unregister_console(&pdc_cons)" invocation.
	b) Added CON_CONSDEV | CON_ENABLED to vt_console_driver[].
           Shouldn't this have #ifdef __hppa__ around it too?
	   This might not get accepted even with ifdefs...<sigh>.

drivers/char/serial.c
	Added CONFIG_GSC support.
	Should be straight forward to apply to pre8.
	Not sure "#ifndef __hppa__" code applies to PCI platforms as well.
	Certainly not to A400/L/N-class platforms.

...
> drivers/net/eepro100.c
	I had changed the default be "#define USE_IO".
	We wouldn't need this if MMIO BARs had kernel virtual addresses. 

> drivers/pci/pci.c
	"Bug" in linus' tree. spinlock_t declaration is getting picked
	up from spinlock.h by "accident" (included by another header file).
	Could someone submit this as a patch to linus?

> drivers/pci/pci.ids
	Please include this with pci.c in the patch.
	mkp added this for suckyio stuff.

...
> include/linux/pci.h
	Prumpf fixed a stub function in linus' tree.
	Another candidate to join pci.c patch submittal.

> include/linux/pci_ids.h
	goes with pci.ids above.

enjoy,
grant

Grant Grundler
Unix Development Lab
+1.408.447.7253