From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: "Depro, Kenneth J" Date: Thu, 6 Nov 2014 10:22:30 -0600 Subject: RE: [PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c Message-ID: <127F4547EB3B47459C5F526C1030C28CDCF2162E30@USEA-EXCH8.na.uis.unisys.com> References: <1415288008-5096-1-git-send-email-kenneth.depro@unisys.com> <20141106160832.GA21519@kroah.com> In-Reply-To: <20141106160832.GA21519@kroah.com> Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 List-ID: To: Greg KH Cc: "jkc@redhat.com" , "driverdev-devel@linuxdriverproject.org" , *S-Par-Maintainer 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 originall= y pulled/built from staging-next, but there was another pending patch of mi= ne in staging-testing that was not in -next, which caused the original appl= y failure). Ken -----Original Message----- From: Greg KH [mailto:gregkh@linuxfoundation.org]=20 Sent: Thursday, November 06, 2014 11:09 AM To: Depro, Kenneth J Cc: jkc@redhat.com; driverdev-devel@linuxdriverproject.org; *S-Par-Maintain= er 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 >=20 > 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. >=20 > Later patches will fix the other checkpatch warnings/checks. >=20 > Conflicts: >=20 > drivers/staging/unisys/virthba/virthba.c How can a single patch "conflict" with anything else? What is this here from? confused, greg k-h