From: "Depro, Kenneth J" <Kenneth.Depro@unisys.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: "jkc@redhat.com" <jkc@redhat.com>,
"driverdev-devel@linuxdriverproject.org"
<driverdev-devel@linuxdriverproject.org>,
*S-Par-Maintainer <SParMaintainer@unisys.com>
Subject: RE: [PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c
Date: Thu, 6 Nov 2014 10:22:30 -0600 [thread overview]
Message-ID: <127F4547EB3B47459C5F526C1030C28CDCF2162E30@USEA-EXCH8.na.uis.unisys.com> (raw)
In-Reply-To: <20141106160832.GA21519@kroah.com>
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@linuxfoundation.org]
Sent: Thursday, November 06, 2014 11:09 AM
To: Depro, Kenneth J
Cc: jkc@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.depro@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
next prev parent reply other threads:[~2014-11-06 16:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-06 15:33 [PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c Ken Depro
2014-11-06 15:54 ` Dan Carpenter
2014-11-06 16:19 ` Depro, Kenneth J
2014-11-06 16:08 ` Greg KH
2014-11-06 16:22 ` Depro, Kenneth J [this message]
2014-11-06 16:44 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-11-07 19:24 Ken Depro
2014-11-17 15:24 ` Depro, Kenneth J
2014-11-05 21:04 Ken Depro
2014-11-05 22:58 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=127F4547EB3B47459C5F526C1030C28CDCF2162E30@USEA-EXCH8.na.uis.unisys.com \
--to=kenneth.depro@unisys.com \
--cc=SParMaintainer@unisys.com \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=jkc@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.