linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Shubhrajyoti Datta <omaplinuxkernel@gmail.com>
Cc: Shubhrajyoti D <shubhrajyoti@ti.com>,
	spi-devel-general@lists.sourceforge.net,
	grant.likely@secretlab.ca, linux-omap@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCHv2 0/3] spi: omap2-mcspi: spi cleanups
Date: Wed, 22 Aug 2012 18:13:58 +0100	[thread overview]
Message-ID: <20120822171358.GW7995@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <CAM=Q2cvEyas6r8pb-edQ7UUJOE1YSxns9j5hA8Cz5pJnd4mPYA@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

On Wed, Aug 22, 2012 at 10:33:55PM +0530, Shubhrajyoti Datta wrote:

> Actually there was a patch in your tree that I sent which is not yet
> in linus tree so I rebased
> it to linux-next to avoid any merge conflicts.

> Henceforth I will rebase it to your tree.

That's also a good option, though for simple conflcits it's OK if the
person applying the patch has to resolve them especially if you give
some warning.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

      reply	other threads:[~2012-08-22 17:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-22  6:05 [PATCHv2 0/3] spi: omap2-mcspi: spi cleanups Shubhrajyoti D
     [not found] ` <1345615515-26745-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-08-22  6:05   ` [PATCHv2 1/3] spi: omap2-mcspi: Call pm_runtime_* functions directly Shubhrajyoti D
2012-08-22  6:05   ` [PATCHv2 2/3] spi: omap2-mcspi: Remove the macro MOD_REG_BIT Shubhrajyoti D
2012-08-22  6:05   ` [PATCHv2 3/3] spi: omap2-mcspi: At remove dont use the runtime_autosuspend calls Shubhrajyoti D
2012-08-22 16:59 ` [PATCHv2 0/3] spi: omap2-mcspi: spi cleanups Mark Brown
2012-08-22 17:03   ` Shubhrajyoti Datta
2012-08-22 17:13     ` Mark Brown [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=20120822171358.GW7995@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=omaplinuxkernel@gmail.com \
    --cc=shubhrajyoti@ti.com \
    --cc=spi-devel-general@lists.sourceforge.net \
    /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;
as well as URLs for NNTP newsgroup(s).