From: Simon Horman <horms@verge.net.au>
To: Baruch Siach <baruch@tkos.co.il>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-serial@vger.kernel.org, linux-sh@vger.kernel.org
Subject: Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
Date: Thu, 06 Feb 2014 08:28:02 +0000 [thread overview]
Message-ID: <20140206082802.GA4152@verge.net.au> (raw)
In-Reply-To: <20140206073801.GD4125@tarshish>
On Thu, Feb 06, 2014 at 09:38:01AM +0200, Baruch Siach wrote:
> Hi Simon,
>
> On Thu, Feb 06, 2014 at 04:25:57PM +0900, Simon Horman wrote:
> > On Thu, Feb 06, 2014 at 09:18:21AM +0200, Baruch Siach wrote:
> > > On Thu, Feb 06, 2014 at 03:40:56PM +0900, Simon Horman wrote:
> > > > On Wed, Feb 05, 2014 at 09:28:38PM +0200, Baruch Siach wrote:
> > > > > Since 93abe8e4 (clk: add non CONFIG_HAVE_CLK routines) code using clk.h
> > > > > like this driver needs not depend on HAVE_CLK.
> > > > >
> > > > > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > > >
> > > > Acked-by: Simon Horman <horms+renesas@verge.net.au>
> > >
> > > Thanks. This patch conflicts with another sh_sci patch you have just posted
> > > (http://article.gmane.org/gmane.linux.serial/13640). How would you like this
> > > to be handled?
> >
> > Indeed it does, sorry for not noticing that.
> >
> > Perhaps it would be best to drop the patch that I posted?
>
> Why drop? There is no logical conflict between the patches, only textual. So
> we just need to serialize them to solve the conflict, and have them go via the
> same tree.
Ok. Could you rebase and repost your patch on top of the patches that
I posted earlier. The reason that I suggest this is that the patches
I posted have been around publicly for some time, albeit not merged by Greg.
prev parent reply other threads:[~2014-02-06 8:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 19:28 [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy Baruch Siach
2014-02-06 6:40 ` Simon Horman
2014-02-06 7:18 ` Baruch Siach
2014-02-06 7:25 ` Simon Horman
2014-02-06 7:38 ` Baruch Siach
2014-02-06 8:28 ` Simon Horman [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=20140206082802.GA4152@verge.net.au \
--to=horms@verge.net.au \
--cc=baruch@tkos.co.il \
--cc=gregkh@linuxfoundation.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/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).