[PATCH 4/5] staging: wilc1000: remove prohibited spaces.

[Greg KH]

On Thu, Jun 18, 2015 at 01:51:15PM +0900, 조성훈 wrote:
> Hi Greg,
> I want to make sure one thing before going further. I cloned the
> staging-testing and then made the first patch. There was no problem when I sent
> the first path to you.
> Afterwards, I also pulled the repository to update my local tree before making
> the second patch. So, I thought I made this second patch based on top of the
> latest commits.
> 
> I am confused why you said I need rebase. Do you mean I have to make my branch
> (for example, staging-wilc1000) from staging-testing and then rebase my commits
> to staging-testing branch before making patch files with git format-patch?

You made the patches correctly, I just accepted patches that were sent
before yours to the tree, which then conflicted with your patches.
That's what happens with a fast-moving tree and a driver that lots of
people are all trying to clean up at the same time.

So rebase on staging-testing again and resend and you should be fine.

thanks,

greg k-h