From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
To: "Sharma, Sanjeev" <Sanjeev_Sharma@mentor.com>
Cc: "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
"oort10@gmail.com" <oort10@gmail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 3/3] staging:r8190: coding style: Fixed checkpatch reported Error
Date: Wed, 6 Aug 2014 07:36:01 -0700 [thread overview]
Message-ID: <20140806143601.GB13552@kroah.com> (raw)
In-Reply-To: <FDC088D3B5555644AE135ED28A7ABDE94DF1BA98@EU-MBX-02.mgc.mentorg.com>
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
prev parent reply other threads:[~2014-08-06 14:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-31 5:43 [PATCH v2 0/3] Fixed commenting style problem Sanjeev Sharma
2014-07-31 5:43 ` [PATCH v2 1/3] staging:r8180: coding style: Fixed commenting style Sanjeev Sharma
2014-07-31 5:43 ` [PATCH v2 2/3] staging:r8180: coding style: Fixed too long lines Sanjeev Sharma
2014-07-31 5:43 ` [PATCH v2 3/3] staging:r8190: coding style: Fixed checkpatch reported Error Sanjeev Sharma
2014-08-06 9:33 ` Sharma, Sanjeev
2014-08-06 14:36 ` gregkh [this message]
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=20140806143601.GB13552@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Sanjeev_Sharma@mentor.com \
--cc=devel@driverdev.osuosl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oort10@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®