[PATCH v2 3/3] staging:r8190: coding style: Fixed checkpatch reported Error

[gregkh at linuxfoundation.org]

On Wed, Aug 06, 2014 at 09:33:56AM +0000, Sharma, Sanjeev wrote:
> Hello All,
> 
> I have submitted few patches last week and also get reply from Greg that patches will show up in linux-next tree and in parallel I need to submit new patches  and now Looks like I need to
> Sync my tree with linux-next tree before start working on New set of change and as soon as I am pulling change I always get conflicts.
> 
> Anyone has idea who to overcome this problem ?

Use a separate branch for your work, and also never use 'git pull' with
linux-next, that just will not work at all.

greg k-h