[parisc-linux] files still needing manual merging

[parisc-linux] files still needing manual merging

[Michael Ang]

Conflicted files which still need to be manually merged using 'cvs up
-jlinus2329 -jlinus2342'

`Makefile'
`drivers/block/rd.c'
`drivers/char/Makefile'
`drivers/char/serial.c'
`drivers/net/tulip.c'
`include/asm-arm/arch-ebsa285/hardware.h'
`include/linux/init.h'`include/linux/mm.h'
`init/main.c'
`kernel/resource.c'
`mm/Makefile'
`mm/bootmem.c'

Files which had conflicts and currently have fixes checked in
drivers/block/ide-dma.c
drivers/video/fm2fb.c
fs/Makefile
fs/buffer.c
include/linux/init.h
include/linux/mm.h
include/linux/ncp_fs.h
mm/filemap.c

Re: [parisc-linux] files still needing manual merging

[Grant Grundler]

Michael Ang wrote:
> Conflicted files which still need to be manually merged using 'cvs up
> -jlinus2329 -jlinus2342'

> `drivers/char/serial.c'

Done. It should be ok now.

grant

Grant Grundler
Unix Development Lab
+1.408.447.7253

Re: [parisc-linux] files still needing manual merging

[Thomas Bogendoerfer]

On Tue, Feb 08, 2000 at 04:33:06PM -0500, Michael Ang wrote:
> `drivers/block/rd.c'

so far that's the only one in my tree, which is left. To get a kernel
compiled, I've just used the 2.3.42 version of that file (haven't commited
it yet). I can't say whether it works, because I'm now at the point, where 
I get unresolved symbols:

ld: Unsatisfied symbols:
   init_ext2_fs (code)
   up_read (code)
   uts_sem (data)
   get_task_struct (code)
   up_write (code)
   pcibios_enable_device (code)
   down_write (code)
   down_read (code)

I've commited all the stuff, I've fixed to get it compiled. I'm going
to look into the problems with the unresolved symbols tomorrow, if
the issues are still unsolved.

Thomas.

-- 
   This device has completely bogus header. Compaq scores again :-|
It's a host bridge, but it should be called ghost bridge instead ;^)
                                        [Martin `MJ' Mares on linux-kernel]

[parisc-linux] Merge status

[Michael Ang]

Merging has been painful, as is often the case.  Thanks to everyone for
helping out and being patient.

We still need to manually merge drivers/block/rd.c and fix some problems
with unresolved symbols.  Hopefully we can finish up merging tommorrow.

	- Mike.

On Wed, 9 Feb 2000, Thomas Bogendoerfer wrote:
> > `drivers/block/rd.c'
> 
> so far that's the only one in my tree, which is left. To get a kernel
> compiled, I've just used the 2.3.42 version of that file (haven't commited
> it yet). I can't say whether it works, because I'm now at the point, where 
> I get unresolved symbols:
> 
> ld: Unsatisfied symbols:
>    init_ext2_fs (code)
>    up_read (code)
>    uts_sem (data)
>    get_task_struct (code)
>    up_write (code)
>    pcibios_enable_device (code)
>    down_write (code)
>    down_read (code)

Re: [parisc-linux] files still needing manual merging

[Grant Grundler]

Thomas Bogendoerfer wrote:
...
> where I get unresolved symbols:
> 
> ld: Unsatisfied symbols:
>    init_ext2_fs (code)
>    up_read (code)
>    uts_sem (data)
>    get_task_struct (code)
>    up_write (code)
>    pcibios_enable_devicepcibios_enable_device (code)
>    down_write (code)
>    down_read (code)

Thomas,
I probably have to add pcibios_enable_device() to arch/parisc/kernel/pci.c.
I can take care of that ASAP.

Card-mode Dino actually wants this kind of a call if it does
what I think it's supposed to do.

thanks!
grant


Grant Grundler
Unix Development Lab
+1.408.447.7253

Re: [parisc-linux] files still needing manual merging

[Grant Grundler]

Thomas Bogendoerfer wrote:
...
> where I get unresolved symbols:

I didn't even get that far in my build:

make[2]: Entering directory `/linux/grundler/linux-2.3/ipc'
gcc -I/linux/grundler/linux-2.3/include -D__KERNEL__ -I/linux/grundler/linux-2.3/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -D__linux__ -pipe -fno-strength-reduce   -c -o util.o util.c
In file included from util.c:17:
/linux/grundler/linux-2.3/include/linux/msg.h:32: asm/msgbuf.h: No such file or directory
make[2]: *** [util.o] Error 1
make[2]: Leaving directory `/linux/grundler/linux-2.3/ipc'



I'll work on the pcibios_enable_device() code now.

grant

Grant Grundler
Unix Development Lab
+1.408.447.7253

Re: [parisc-linux] files still needing manual merging

[Thomas Bogendoerfer]

On Tue, Feb 08, 2000 at 05:19:35PM -0800, Grant Grundler wrote:
> I didn't even get that far in my build:
> 
> make[2]: Entering directory `/linux/grundler/linux-2.3/ipc'
> gcc -I/linux/grundler/linux-2.3/include -D__KERNEL__ -I/linux/grundler/linux-2.3/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -D__linux__ -pipe -fno-strength-reduce   -c -o util.o util.c
> In file included from util.c:17:
> /linux/grundler/linux-2.3/include/linux/msg.h:32: asm/msgbuf.h: No such file or directory

that's a new file, I forgot to check it in. I'll do that, when I get home.
A quick fix for this would be to copy asm-sparc/msgbuf.h to asm-parisc.

Thomas.