From: Baruch Siach <baruch@tkos.co.il>
To: Simon Horman <horms@verge.net.au>
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 07:38:01 +0000 [thread overview]
Message-ID: <20140206073801.GD4125@tarshish> (raw)
In-Reply-To: <20140206072557.GA24865@verge.net.au>
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.
baruch
> > > > ---
> > > > drivers/tty/serial/Kconfig | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> > > > index a3815eaed421..ce6fd1dd0864 100644
> > > > --- a/drivers/tty/serial/Kconfig
> > > > +++ b/drivers/tty/serial/Kconfig
> > > > @@ -708,7 +708,7 @@ config SERIAL_IP22_ZILOG_CONSOLE
> > > >
> > > > config SERIAL_SH_SCI
> > > > tristate "SuperH SCI(F) serial port support"
> > > > - depends on HAVE_CLK && (SUPERH || ARM || COMPILE_TEST)
> > > > + depends on SUPERH || ARM || COMPILE_TEST
> > > > select SERIAL_CORE
> > > >
> > > > config SERIAL_SH_SCI_NR_UARTS
> > > > --
> > > > 1.8.5.3
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{ - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
next prev parent reply other threads:[~2014-02-06 7:38 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 [this message]
2014-02-06 8:28 ` Simon Horman
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=20140206073801.GD4125@tarshish \
--to=baruch@tkos.co.il \
--cc=gregkh@linuxfoundation.org \
--cc=horms@verge.net.au \
--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).