linux-kernel - Re: [PATCH v2 3/3] staging:r8190: coding style: Fixed checkpatch reported Error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20140806143601.GB13552@kroah.com>
Date:	Wed, 6 Aug 2014 07:36:01 -0700
From:	"gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>
To:	"Sharma, Sanjeev" <Sanjeev_Sharma@...tor.com>
Cc:	"devel@...verdev.osuosl.org" <devel@...verdev.osuosl.org>,
	"oort10@...il.com" <oort10@...il.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 3/3] staging:r8190: coding style: Fixed checkpatch
 reported Error

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/