[patch 7/7] aic79xx_core: remove ascii art

[patch 7/7] aic79xx_core: remove ascii art

[akpm]

From: Andrew Morton <akpm@linux-foundation.org>

Those '<<<<<<<' lines keep on emitting false-positives when I'm grepping for
git conflicts.  Replace them with '='.

Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/aic7xxx/aic79xx_core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/scsi/aic7xxx/aic79xx_core.c~aic79xx_core-remove-ascii-art drivers/scsi/aic7xxx/aic79xx_core.c
--- a/drivers/scsi/aic7xxx/aic79xx_core.c~aic79xx_core-remove-ascii-art
+++ a/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -9745,7 +9745,7 @@ ahd_dump_card_state(struct ahd_softc *ah
 	}
 	saved_modes = ahd_save_modes(ahd);
 	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
-	printf(">>>>>>>>>>>>>>>>>> Dump Card State Begins <<<<<<<<<<<<<<<<<\n"
+	printf("================== Dump Card State Begins =================\n"
 	       "%s: Dumping Card State at program address 0x%x Mode 0x%x\n",
 	       ahd_name(ahd), 
 	       ahd_inw(ahd, CURADDR),
@@ -9981,7 +9981,7 @@ ahd_dump_card_state(struct ahd_softc *ah
 		ahd_outb(ahd, STACK, ahd->saved_stack[i] & 0xFF);
 		ahd_outb(ahd, STACK, (ahd->saved_stack[i] >> 8) & 0xFF);
 	}
-	printf("\n<<<<<<<<<<<<<<<<< Dump Card State Ends >>>>>>>>>>>>>>>>>>\n");
+	printf("\n================= Dump Card State Ends ==================\n");
 	ahd_restore_modes(ahd, saved_modes);
 	if (paused == 0)
 		ahd_unpause(ahd);
_

Re: [patch 7/7] aic79xx_core: remove ascii art

[James Bottomley]

On Fri, 2008-05-02 at 13:44 -0700, akpm@linux-foundation.org wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> Those '<<<<<<<' lines keep on emitting false-positives when I'm grepping for
> git conflicts.  Replace them with '='.

I'm not opposed to this in principle, but I have to ask how?  The grep
for conflicts remaining in a file is

egrep '^<<<<<<<|^=======|^>>>>>>' <file>

Which doesn't match anything in the aic7xxx directory.  If you're
grepping without the anchor, then you're going to get another match
looking for ===== with your change, aren't you?

James

Re: [patch 7/7] aic79xx_core: remove ascii art

[Andrew Morton]

On Fri, 02 May 2008 16:10:32 -0500
James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> On Fri, 2008-05-02 at 13:44 -0700, akpm@linux-foundation.org wrote:
> > From: Andrew Morton <akpm@linux-foundation.org>
> > 
> > Those '<<<<<<<' lines keep on emitting false-positives when I'm grepping for
> > git conflicts.  Replace them with '='.
> 
> I'm not opposed to this in principle, but I have to ask how?  The grep
> for conflicts remaining in a file is
> 
> egrep '^<<<<<<<|^=======|^>>>>>>' <file>
> 
> Which doesn't match anything in the aic7xxx directory.  If you're
> grepping without the anchor, then you're going to get another match
> looking for ===== with your change, aren't you?

Yeah, I'm being lazy.  Might as well drop it and I'll do more typing :)

Re: [patch 7/7] aic79xx_core: remove ascii art

[Jeff Garzik]

Andrew Morton wrote:
> On Fri, 02 May 2008 16:10:32 -0500
> James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> 
>> On Fri, 2008-05-02 at 13:44 -0700, akpm@linux-foundation.org wrote:
>>> From: Andrew Morton <akpm@linux-foundation.org>
>>>
>>> Those '<<<<<<<' lines keep on emitting false-positives when I'm grepping for
>>> git conflicts.  Replace them with '='.
>> I'm not opposed to this in principle, but I have to ask how?  The grep
>> for conflicts remaining in a file is
>>
>> egrep '^<<<<<<<|^=======|^>>>>>>' <file>
>>
>> Which doesn't match anything in the aic7xxx directory.  If you're
>> grepping without the anchor, then you're going to get another match
>> looking for ===== with your change, aren't you?
> 
> Yeah, I'm being lazy.  Might as well drop it and I'll do more typing :)

Bah, I agree with the patch, let's put it in.

I always look for '<<<<' too.

	Jeff