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:gre...@linuxfoundation.org] Sent: Thursday, November 06, 2014 11:09 AM To: Depro, Kenneth J Cc: j...@redhat.com; driverdev-devel@linuxdriverproject.org; *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.de...@unisys.com> > > 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 de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
