RE: [PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c

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

 



Greg,

When I executed the format-patch command, it added the conflict lines below.  There was indeed a conflict in this file from yesterday (I had originally pulled/built from staging-next, but there was another pending patch of mine in staging-testing that was not in -next, which caused the original apply failure).

Ken
-----Original Message-----
From: Greg KH [mailto:gregkh@xxxxxxxxxxxxxxxxxxx] 
Sent: Thursday, November 06, 2014 11:09 AM
To: Depro, Kenneth J
Cc: jkc@xxxxxxxxxx; driverdev-devel@xxxxxxxxxxxxxxxxxxxxxx; *S-Par-Maintainer
Subject: Re: [PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c

On Thu, Nov 06, 2014 at 10:33:28AM -0500, Ken Depro wrote:
> From: Ken Depro <kenneth.depro@xxxxxxxxxx>
> 
> This patch removes unneeded spaces after casts within the virthba.c
> file.  The checkpatch script was run after these changes, and no
> "remove spaces after casts" checks were generated.
> 
> Later patches will fix the other checkpatch warnings/checks.
> 
> Conflicts:
> 
> 	drivers/staging/unisys/virthba/virthba.c

How can a single patch "conflict" with anything else?  What is this here
from?

confused,

greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel




[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux