Re: PR/39468 CVS commit: src/sys/dev

["Juan Romero Pardines" <xtraeme%gmail.com@localhost>]

The following reply was made to PR kern/39468; it has been noted by GNATS.

From: "Juan Romero Pardines" <xtraeme%gmail.com@localhost>
To: "NetBSD GNATS" <gnats-bugs%netbsd.org@localhost>
Cc: woods%planix.com@localhost
Subject: Re: PR/39468 CVS commit: src/sys/dev
Date: Wed, 10 Sep 2008 20:23:22 +0200

 2008/9/10 Greg A. Woods <woods%planix.com@localhost>:
 > At Tue,  9 Sep 2008 12:50:04 +0000 (UTC), Matthias Scheler wrote:
 > Subject: PR/39468 CVS commit: src/sys/dev
 >>
 >>  Module Name: src
 >>  Committed By:        tron
 >>  Date:                Tue Sep  9 12:45:40 UTC 2008
 >>
 >>  Modified Files:
 >>       src/sys/dev: ld.c ldvar.h
 >>       src/sys/dev/ata: ld_ataraid.c
 >>       src/sys/dev/i2o: ld_iop.c
 >>       src/sys/dev/ic: ld_aac.c ld_cac.c ld_icp.c ld_mlx.c mlx.c
 >>       src/sys/dev/pci: ld_amr.c ld_twa.c ld_twe.c
 >>
 >>  Log Message:
 >>  Complete device_t/softc split for the ld(4) attachments. This should
 >>  prevent crashes while attaching a drive.
 >>
 >>  Patch supplied by Juan RP in PR kern/39468.
 >
 > From what I can tell this patch undid the following change, or at least
 > one small part of it:
 >
 >        src/sys/dev/ata/ld_ataraid.c
 >
 >        revision 1.26
 >        date: 2008/04/05 22:04:36;  author: cegger;  state: Exp;  lines: +6 -7
 >        branches:  1.26.2;  1.26.4;
 >        use aprint_*_dev and device_xname
 >
 > I noticed this because when merging this file against my local copy with
 > the manually applied patch I encountered the following conflict:
 >
 >
 > <<<<<<< ld_ataraid.c
 >                aprint_error_dev(&sc->sc_ld.sc_dv, "error %d on component %d 
 > (%s)\n",
 >                                 bp->b_error, cbp->cb_comp,
 >                                 device_xname(adi->adi_dev));
 > =======
 >                printf("%s: error %d on component %d (%s)\n",
 >                    device_xname(sc->sc_ld.sc_dv), bp->b_error, cbp->cb_comp,
 >                    device_xname(adi->adi_dev));
 >>>>>>>> 1.29
 
 That's not correct. Probably you are using an old revision or something,
 but I'm sure I haven't done this on this commit. Check it out yourself:
 
 
http://cvsweb.netbsd.se/cgi-bin/bsdweb.cgi/src/sys/dev/ata/ld_ataraid.c.diff?r1=1.28;r2=1.29;f=h