NetBSD-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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

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

From: "Greg A. Woods; Planix, Inc." <>
To: "Juan Romero Pardines" <>
Subject: Re: PR/39468 CVS commit: src/sys/dev
Date: Wed, 10 Sep 2008 14:34:48 -0400

 This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
 Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
 Content-Transfer-Encoding: 7bit
 On 10-Sep-08, at 2:23 PM, Juan Romero Pardines wrote:
 > 2008/9/10 Greg A. Woods <>:
 >> 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:
 Hmmm... perhaps it was me who made that change locally to fix that one  
 last lone printf() that I thought may have been missed by the 1.26 rev.
                                        Greg A. Woods; Planix, Inc.
 content-type: application/pgp-signature; x-mac-type=70674453;
 content-description: This is a digitally signed message part
 content-disposition: inline; filename=PGP.sig
 content-transfer-encoding: 7bit
 Version: GnuPG v1.4.8 (Darwin)

Home | Main Index | Thread Index | Old Index