| 
      
      
      From: Roman Z. <zi...@us...> - 2001-10-17 22:56:16
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/mm/
Changes by:	zippel@usw-pr-cvs1.	01/10/17 15:56:15
Log message:
  conflict fixes from import bitkeeper (2.4.12)
Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile defconfig 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        apus_pci.c apus_setup.c head.S irq.c ppc_ksyms.c setup.c 
        time.c 
      2.3/arch/ppc/mm/:
        init.c pgtable.c 
      2.3/drivers/char/:
        Makefile mem.c ser_a2232.c 
      2.3/drivers/ide/:
        Config.in buddha.c 
      2.3/drivers/net/:
        Makefile 
      2.3/drivers/scsi/:
        Config.in Makefile NCR53C9x.h 
      2.3/drivers/sound/dmasound/:
        dmasound_paula.c 
      2.3/drivers/video/:
        Config.in amifb.c fbmem.c pm2fb.c virgefb.c 
      2.3/fs/partitions/:
        mac.c 
      2.3/include/asm-ppc/:
        bootinfo.h io.h page.h pgtable.h 
      2.3/include/linux/:
        irq.h 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/arch/ppc/8xx_io/:
        micropatch.c 
      2.3/arch/ppc/kernel/:
        temp.c 
      2.3/drivers/acpi/namespace/:
        nsdump.c 
      2.3/drivers/scsi/:
        qlogicfc_asm.c 
      2.3/include/linux/:
        compiler.h 
Removed files:
      2.3/arch/mips/:
        defconfig-cobalt defconfig-orion 
      2.3/arch/mips/boot/:
        mkboot.c 
      2.3/arch/mips/dec/:
        serial.c 
      2.3/arch/mips/kernel/:
        fpe.c softfp.S 
      2.3/arch/mips/sgi/kernel/:
        indy_timer.c promcon.c 
      2.3/arch/mips/sni/:
        dma.c 
      2.3/arch/ppc/8xx_io/:
        commproc.h 
      2.3/arch/sh/mm/:
        cache.c 
      2.3/drivers/acpi/parser/:
        psfind.c 
      2.3/drivers/bluetooth/:
        hci_emu.c 
      2.3/drivers/char/:
        vino.h 
      2.3/drivers/ide/:
        amd7409.c qd6580.c 
      2.3/drivers/mtd/chips/:
        cfi_jedec.c 
      2.3/drivers/net/:
        ncr885_debug.h ncr885e.c ncr885e.h 
      2.3/drivers/sgi/char/:
        graphics_syms.c 
      2.3/drivers/tc/:
        tcsyms.c 
      2.3/drivers/usb/:
        hid.c net1080.c plusb.c 
      2.3/include/asm-ppc/:
        init.h 
      2.3/include/asm-sparc64/:
        vaddrs.h 
      2.3/include/net/bluetooth/:
        hci_emu.h 
      2.3/mm/:
        mmap_avl.c 
  
  Revision      Changes    Path
  1.27          +42 -9     2.3/Makefile
  1.19          +436 -61   2.3/Documentation/Configure.help
  1.11          +4 -1      2.3/arch/ppc/Makefile
  1.14          +40 -11    2.3/arch/ppc/defconfig
  1.12          +40 -11    2.3/arch/ppc/configs/apus_defconfig
  1.8           +5 -3      2.3/arch/ppc/kernel/apus_pci.c
  1.24          +1 -106    2.3/arch/ppc/kernel/apus_setup.c
  1.23          +1 -1      2.3/arch/ppc/kernel/head.S
  1.11          +14 -7     2.3/arch/ppc/kernel/irq.c
  1.26          +6 -4      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.18          +20 -31    2.3/arch/ppc/kernel/setup.c
  1.14          +4 -4      2.3/arch/ppc/kernel/time.c
  1.22          +4 -1      2.3/arch/ppc/mm/init.c
  1.3           +3 -3      2.3/arch/ppc/mm/pgtable.c
  1.15          +22 -15    2.3/drivers/char/Makefile
  1.10          +1 -3      2.3/drivers/char/mem.c
  1.5           +4 -0      2.3/drivers/char/ser_a2232.c
  1.5           +17 -2     2.3/drivers/ide/Config.in
  1.6           +2 -2      2.3/drivers/ide/buddha.c
  1.10          +10 -9     2.3/drivers/net/Makefile
  1.9           +19 -2     2.3/drivers/scsi/Config.in
  1.6           +30 -24    2.3/drivers/scsi/Makefile
  1.4           +3 -3      2.3/drivers/scsi/NCR53C9x.h
  1.4           +6 -6      2.3/drivers/sound/dmasound/dmasound_paula.c
  1.6           +73 -24    2.3/drivers/video/Config.in
  1.11          +3 -1      2.3/drivers/video/amifb.c
  1.11          +6 -2      2.3/drivers/video/fbmem.c
  1.6           +2 -0      2.3/drivers/video/pm2fb.c
  1.7           +2 -0      2.3/drivers/video/virgefb.c
  1.4           +24 -37    2.3/fs/partitions/mac.c
  1.8           +1 -1      2.3/include/asm-ppc/bootinfo.h
  1.11          +19 -8     2.3/include/asm-ppc/io.h
  1.5           +1 -1      2.3/include/asm-ppc/page.h
  1.11          +31 -7     2.3/include/asm-ppc/pgtable.h
  1.4           +14 -0     2.3/include/linux/irq.h
  1.18          +212 -327  2.3/mm/page_alloc.c
 | 
| 
      
      
      From: Roman Z. <zi...@us...> - 2001-10-25 22:02:41
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/mm/
Changes by:	zippel@usw-pr-cvs1.	01/10/25 15:02:41
Log message:
  conflict fixes from import bitkeeper (2.4.13)
Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile defconfig 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        apus_setup.c head.S ppc_ksyms.c setup.c 
      2.3/drivers/char/:
        Makefile 
      2.3/drivers/net/:
        Makefile hydra.c 
      2.3/drivers/scsi/:
        Config.in 
      2.3/drivers/video/:
        Config.in virgefb.c 
      2.3/include/asm-ppc/:
        io.h mpc8xx.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/Documentation/video4linux/:
        README.buz 
      2.3/arch/arm/boot/compressed/:
        setup-sa1100.S 
      2.3/arch/arm/mach-sa1100/:
        bitsy.c 
      2.3/arch/arm/mm/:
        mm-nexuspci.c 
      2.3/arch/s390/kernel/:
        lowcore.S 
      2.3/arch/s390x/kernel/:
        lowcore.S mathemu.c 
      2.3/drivers/i2o/:
        Config.in Makefile README README.ioctl i2o_block.c 
        i2o_config.c i2o_core.c i2o_lan.c i2o_lan.h i2o_pci.c 
        i2o_proc.c i2o_scsi.c i2o_scsi.h 
      2.3/fs/fat/:
        msbuffer.h 
      2.3/include/asm-arm/arch-sa1100/:
        bitsy.h 
      2.3/include/asm-s390x/:
        mathemu.h 
  
  Revision      Changes    Path
  1.28          +3 -2      2.3/Makefile
  1.20          +240 -34   2.3/Documentation/Configure.help
  1.12          +1 -1      2.3/arch/ppc/Makefile
  1.15          +99 -4     2.3/arch/ppc/defconfig
  1.13          +99 -4     2.3/arch/ppc/configs/apus_defconfig
  1.25          +1 -5      2.3/arch/ppc/kernel/apus_setup.c
  1.24          +3 -3      2.3/arch/ppc/kernel/head.S
  1.27          +2 -2      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.19          +2 -2      2.3/arch/ppc/kernel/setup.c
  1.16          +6 -0      2.3/drivers/char/Makefile
  1.11          +1 -0      2.3/drivers/net/Makefile
  1.4           +1 -0      2.3/drivers/net/hydra.c
  1.10          +3 -2      2.3/drivers/scsi/Config.in
  1.7           +5 -15     2.3/drivers/video/Config.in
  1.8           +1 -1      2.3/drivers/video/virgefb.c
  1.12          +4 -5      2.3/include/asm-ppc/io.h
  1.5           +3 -3      2.3/include/asm-ppc/mpc8xx.h
  1.19          +20 -19    2.3/mm/page_alloc.c
 | 
| 
      
      
      From: Roman Z. <zi...@us...> - 2001-10-25 22:10:47
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/fs/fat/
Changes by:	zippel@usw-pr-cvs1.	01/10/25 15:10:46
Log message:
  conflict fixes from import bitkeeper (2.4.13)
Removed files:
      2.3/fs/ext2/:
        acl.c 
      2.3/fs/fat/:
        tables.c tables.h 
 | 
| 
      
      
      From: Roman Z. <zi...@us...> - 2001-10-29 20:20:46
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/Documentation/usb/
Changes by:	zippel@usw-pr-cvs1.	01/10/29 12:20:44
Log message:
  remove obsolete files
Removed files:
      2.3/Documentation/:
        joystick-api.txt joystick-parport.txt joystick.txt 
      2.3/Documentation/usb/:
        input.txt 
 | 
| 
      
      
      From: Roman Z. <zi...@us...> - 2001-10-29 23:09:39
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/include/asm-ppc/
Changes by:	zippel@usw-pr-cvs1.	01/10/29 15:09:38
Log message:
  mem start/offset cleanups
Modified files:
      2.3/arch/ppc/kernel/:
        apus_setup.c setup.c 
      2.3/arch/ppc/mm/:
        init.c mmu_decl.h pgtable.c ppc_mmu.c 
      2.3/include/asm-ppc/:
        page.h pgtable.h 
  
  Revision      Changes    Path
  1.26          +2 -5      2.3/arch/ppc/kernel/apus_setup.c
  1.20          +0 -7      2.3/arch/ppc/kernel/setup.c
  1.23          +7 -4      2.3/arch/ppc/mm/init.c
  1.2           +1 -1      2.3/arch/ppc/mm/mmu_decl.h
  1.4           +1 -3      2.3/arch/ppc/mm/pgtable.c
  1.2           +4 -4      2.3/arch/ppc/mm/ppc_mmu.c
  1.6           +2 -2      2.3/include/asm-ppc/page.h
  1.12          +1 -1      2.3/include/asm-ppc/pgtable.h
 | 
| 
      
      
      From: Roman Z. <zi...@us...> - 2001-10-31 23:20:12
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/drivers/parport/
Changes by:	zippel@usw-pr-cvs1.	01/10/31 15:20:11
Log message:
  wait for acknowledge before sending next character
  fix racy wait queue
Modified files:
      2.3/include/linux/:
        parport.h 
      2.3/drivers/parport/:
        ieee1284.c ieee1284_ops.c share.c 
  
  Revision      Changes    Path
  1.3           +28 -11    2.3/include/linux/parport.h
  1.3           +92 -38    2.3/drivers/parport/ieee1284.c
  1.3           +52 -22    2.3/drivers/parport/ieee1284_ops.c
  1.4           +242 -55   2.3/drivers/parport/share.c
 | 
| 
      
      
      From: Alan b. <ala...@us...> - 2001-11-04 18:38:43
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/drivers/
Changes by:	alanbuxey@usw-pr-cvs1.	01/11/04 10:38:29
Log message:
  Commented out the i2o entries - not APUS depended and contents not present
  (allows the `make dep` to work)
Modified files:
      2.3/drivers/:
        Makefile 
  
  Revision      Changes    Path
  1.2           +45 -176   2.3/drivers/Makefile
 | 
| 
      
      
      From: Roman Z. <zi...@li...> - 2001-11-04 19:04:18
       | 
| Hi, Alan buxey wrote: > Commented out the i2o entries - not APUS depended and contents not present > (allows the `make dep` to work) What is the actual problem? bye, Roman | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-05 12:41:15
       | 
| hi, > > Commented out the i2o entries - not APUS depended and contents not present > > (allows the `make dep` to work) > > What is the actual problem? i2o contents are not present - unless my CVS tree is somehow missing these? alan | 
| 
      
      
      From: Alan b. <ala...@us...> - 2001-11-04 19:04:45
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/fs/
Changes by:	alanbuxey@usw-pr-cvs1.	01/11/04 11:04:45
Log message:
  Comment out JFFS2 in Makefile as we dont have the directory in APUS yet
Modified files:
      2.3/fs/:
        Makefile 
  
  Revision      Changes    Path
  1.3           +62 -321   2.3/fs/Makefile
 | 
| 
      
      
      From: Michel  <mic...@ii...> - 2001-11-04 19:10:14
       | 
| On Sun, 2001-11-04 at 20:04, Alan buxey wrote: > Log message: > Comment out JFFS2 in Makefile as we dont have the directory in APUS yet Alan, stop this _now_ and use cvs update -d please. --=20 Earthling Michel D=E4nzer (MrCooper)/ Debian GNU/Linux (powerpc) developer XFree86 and DRI project member / CS student, Free Software enthusiast | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-05 12:43:04
       | 
| hi, > Alan, stop this _now_ and use cvs update -d please. aarggh! i'm *SO* sorry to have not noticed that i dont have a .cvsrc under my account - REALLY sorry. alan | 
| 
      
      
      From: Michel  <mic...@ii...> - 2001-11-13 11:17:06
       | 
| Alan Buxey wrote: > > Alan, stop this _now_ and use cvs update -d please. > > aarggh! i'm *SO* sorry to have not noticed that i dont have > a .cvsrc under my account - REALLY sorry. In the future, please eliminate all error on your end before making changes to the repository. -- Earthling Michel Dänzer (MrCooper)/ Debian GNU/Linux (powerpc) developer XFree86 and DRI project member / CS student, Free Software enthusiast | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-05 12:44:06
       | 
| hi, I'll submit the re--refixed makefiles this evening if someone has not done so already alan | 
| 
      
      
      From: Roman Z. <zi...@li...> - 2001-11-05 18:08:39
       | 
| Hi, Alan Buxey wrote: > I'll submit the re--refixed makefiles this evening if someone > has not done so already I fixed it already, just run an update, but before put something like this into your .cvsrc: checkout -P update -d -P bye, Roman | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-05 19:57:26
       | 
| hi, > I fixed it already, just run an update, but before put something like > this into your .cvsrc: > > checkout -P > update -d -P :-) i know...i am SO embarressed about my thoughts of the lack of contents in the 2.4.x tree (thought we'd lost sync a lot) ... i've since copied my .cvsrc from my older system..duh! alan | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-05 12:45:43
       | 
| hi, can someone point me to a resource where i can easily see the changes made to the serial system between the 2.2.x and 2.4.x kernels? We have various missing drivers that need to be updated....and i now have such hardware in my system after the recent WOASE 2001 alan | 
| 
      
      
      From: Giorgio T. <de...@ip...> - 2001-11-05 17:29:15
       | 
| Alan Buxey wrote:
> hi,
>
> can someone point me to a resource where i can easily see
> the changes made to the serial system between the
> 2.2.x and 2.4.x kernels?  We have various missing
> drivers that need to be updated....and i now have
> such hardware in my system after the recent WOASE 2001
>
> alan
>
m68kserial  interface is lost...(sigh!),
one alternative is to use the new generic_serial meta_driver
I am working with it for an 2.4.xx IOBlix serial driver and i am in
the debugging phase.
If the UARTs you use are Startech as IOBlix we may unify it ...
Regards
                Giorgio Terzi
 | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-05 19:55:30
       | 
| hi, > m68kserial interface is lost...(sigh!), > one alternative is to use the new generic_serial meta_driver > I am working with it for an 2.4.xx IOBlix serial driver and i am in > the debugging phase. > If the UARTs you use are Startech as IOBlix we may unify it ... its the Ioblix1200 serial that i was looking at! the reason why is that i use the hypercom module under 2.2.10 with my ioblix1200 serial and it works 100% fine..... so if this was brought up to 2.4.x then we'd have a working driver for all the hypercom/ioblix1200 people out there alan | 
| 
      
      
      From: Geert U. <Gee...@so...> - 2001-11-06 09:35:08
       | 
| On Mon, 5 Nov 2001, Giorgio Terzi wrote:
> I am working with it for an 2.4.xx IOBlix serial driver and i am in
> the debugging phase.
> If the UARTs you use are Startech as IOBlix we may unify it ...
Which Startech UART? A quick search on Google for `Startech UART' reveale=
d they
have both MC68681 and 16550 compatible parts.
If they use the MC68681 (I think so, since the IOBlix has parallel ports =
as
well), you can work together with J=F6rg Dorchain (IIRC the MFC3 uses the=
 same
chip).
Gr{oetje,eeting}s,
						Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m6=
8k.org
In personal conversations with technical people, I call myself a hacker. =
But
when I'm talking to journalists I just say "programmer" or something like=
 that.
							    -- Linus Torvalds
 | 
| 
      
      
      From: Alan B. <al...@ms...> - 2001-11-06 11:20:18
       | 
| hi, > > I am working with it for an 2.4.xx IOBlix serial driver and i am in > > the debugging phase. > > If the UARTs you use are Startech as IOBlix we may unify it ... > > Which Startech UART? A quick search on Google for `Startech UART' revea= led they > have both MC68681 and 16550 compatible parts. > > If they use the MC68681 (I think so, since the IOBlix has parallel port= s as > well), you can work together with J=F6rg Dorchain (IIRC the MFC3 uses t= he same > chip). the IOBlix1200 serial uses a 16550 compatible part - as does the hypercom alan | 
| 
      
      
      From: Giorgio T. <de...@ip...> - 2001-11-07 16:50:22
       | 
| Hello Geert
...
> On Mon, 5 Nov 2001, Giorgio Terzi wrote:
>> I am working with it for an 2.4.xx IOBlix serial driver and i am in
>> the debugging phase.
>> If the UARTs you use are Startech as IOBlix we may unify it ...
>=20
> Which Startech UART? A quick search on Google for `Startech UART' revea=
led
> they have both MC68681 and 16550 compatible parts.
>=20
> If they use the MC68681 (I think so, since the IOBlix has parallel port=
s as
> well), you can work together with J=F6rg Dorchain (IIRC the MFC3 uses t=
he same
> chip).
For IOBlix Zorro 2 is an Exar 16C654,=20
i am using a lot of low level things from Ted Ts'o PC serial driver becau=
se is
very similar.
Regards
--=20
                                                 Giorgio Terzi
 | 
| 
      
      
      From: Giorgio T. <de...@ip...> - 2001-11-07 16:52:22
       | 
| Hello Geert
...
> If they use the MC68681 (I think so, since the IOBlix has parallel port=
s as
> well), you can work together with J=F6rg Dorchain (IIRC the MFC3 uses t=
he same
> chip).
P.S. The parallel chip IOBlix Zorro2 uses is an EXAR ST78C36.
Regards
--=20
                                                 Giorgio Terzi
 | 
| 
      
      
      From: Roman Z. <zi...@li...> - 2001-11-04 19:14:28
       | 
| Hi, Alan buxey wrote: > Log message: > Comment out JFFS2 in Makefile as we dont have the directory in APUS yet cvs up -d? bye, Roman | 
| 
      
      
      From: Roman Z. <zi...@us...> - 2001-11-05 01:17:55
       | 
| CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/drivers/char/joystick/
Changes by:	zippel@usw-pr-cvs1.	01/11/04 17:17:53
Log message:
  set SA_SHIRQ for shared irq
Modified files:
      2.3/drivers/video/:
        fbcon.c amifb.c 
      2.3/drivers/char/:
        amigamouse.c amiserial.c ser_a2232.c 
      2.3/drivers/char/joystick/:
        amijoy.c 
  
  Revision      Changes    Path
  1.2           +157 -71   2.3/drivers/video/fbcon.c
  1.12          +5 -4      2.3/drivers/video/amifb.c
  1.4           +3 -1      2.3/drivers/char/amigamouse.c
  1.5           +91 -7     2.3/drivers/char/amiserial.c
  1.6           +1 -1      2.3/drivers/char/ser_a2232.c
  1.2           +18 -6     2.3/drivers/char/joystick/amijoy.c
 |