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

["Greg A. Woods" <woods%planix.com@localhost>]

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

From: "Greg A. Woods" <woods%planix.com@localhost>
To: NetBSD GNATS <gnats-bugs%NetBSD.org@localhost>
Cc: tron%NetBSD.org@localhost,
        xtraeme%gmail.com@localhost
Subject: Re: PR/39468 CVS commit: src/sys/dev
Date: Wed, 10 Sep 2008 14:18:45 -0400

 --pgp-sign-Multipart_Wed_Sep_10_14:17:51_2008-1
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 At Tue,  9 Sep 2008 12:50:04 +0000 (UTC), Matthias Scheler wrote:
 Subject: PR/39468 CVS commit: src/sys/dev
 >=20
 >  Module Name:        src
 >  Committed By:       tron
 >  Date:               Tue Sep  9 12:45:40 UTC 2008
 > =20
 >  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
 > =20
 >  Log Message:
 >  Complete device_t/softc split for the ld(4) attachments. This should
 >  prevent crashes while attaching a drive.
 > =20
 >  Patch supplied by Juan RP in PR kern/39468.
 
 =46rom 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));
 =3D=3D=3D=3D=3D=3D=3D
                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
 
 
 --=20
                                                Greg A. Woods
                                                Planix, Inc.
 
 <woods%planix.com@localhost>     +1 416 489-5852 x122     
http://www.planix.com/
 
 --pgp-sign-Multipart_Wed_Sep_10_14:17:51_2008-1
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: PGPfreeware 5.0i for non-commercial use
 MessageID: Wbc1XxJuzOrbl524zYsbbor4gq7qmYeX
 
 iQA/AwUBSMgPhWZ9cbd4v/R/EQKDPACgvPXVuiqauNwJqptBulImTuNZw0MAnjfX
 dSu/iHVdoOlNbOtX1mn3OUeU
 =Qsgw
 -----END PGP SIGNATURE-----
 
 --pgp-sign-Multipart_Wed_Sep_10_14:17:51_2008-1--