All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-05 19:28 ` Baruch Siach
  0 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2014-02-05 19:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: linux-serial, linux-sh, Baruch Siach

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>
---
 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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-05 19:28 ` Baruch Siach
  0 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2014-02-05 19:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: linux-serial, linux-sh, Baruch Siach

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>
---
 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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
  2014-02-05 19:28 ` Baruch Siach
@ 2014-02-06  6:40   ` Simon Horman
  -1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-02-06  6:40 UTC (permalink / raw)
  To: Baruch Siach; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

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>

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-06  6:40   ` Simon Horman
  0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-02-06  6:40 UTC (permalink / raw)
  To: Baruch Siach; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

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>

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
  2014-02-06  6:40   ` Simon Horman
@ 2014-02-06  7:18     ` Baruch Siach
  -1 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2014-02-06  7:18 UTC (permalink / raw)
  To: Simon Horman; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

Hi Simon,

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?

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 -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-06  7:18     ` Baruch Siach
  0 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2014-02-06  7:18 UTC (permalink / raw)
  To: Simon Horman; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

Hi Simon,

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?

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 -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
  2014-02-06  7:18     ` Baruch Siach
@ 2014-02-06  7:25       ` Simon Horman
  -1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-02-06  7:25 UTC (permalink / raw)
  To: Baruch Siach; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

On Thu, Feb 06, 2014 at 09:18:21AM +0200, Baruch Siach wrote:
> Hi Simon,
> 
> 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?

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-06  7:25       ` Simon Horman
  0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-02-06  7:25 UTC (permalink / raw)
  To: Baruch Siach; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

On Thu, Feb 06, 2014 at 09:18:21AM +0200, Baruch Siach wrote:
> Hi Simon,
> 
> 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?

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
  2014-02-06  7:25       ` Simon Horman
@ 2014-02-06  7:38         ` Baruch Siach
  -1 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2014-02-06  7:38 UTC (permalink / raw)
  To: Simon Horman; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

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 -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-06  7:38         ` Baruch Siach
  0 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2014-02-06  7:38 UTC (permalink / raw)
  To: Simon Horman; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

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 -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
  2014-02-06  7:38         ` Baruch Siach
@ 2014-02-06  8:28           ` Simon Horman
  -1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-02-06  8:28 UTC (permalink / raw)
  To: Baruch Siach; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

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.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy
@ 2014-02-06  8:28           ` Simon Horman
  0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-02-06  8:28 UTC (permalink / raw)
  To: Baruch Siach; +Cc: Greg Kroah-Hartman, linux-serial, linux-sh

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.

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2014-02-06  8:28 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-05 19:28 [PATCH] serial: sh_sci: remove HAVE_CLK build dependecy Baruch Siach
2014-02-05 19:28 ` Baruch Siach
2014-02-06  6:40 ` Simon Horman
2014-02-06  6:40   ` Simon Horman
2014-02-06  7:18   ` Baruch Siach
2014-02-06  7:18     ` Baruch Siach
2014-02-06  7:25     ` Simon Horman
2014-02-06  7:25       ` Simon Horman
2014-02-06  7:38       ` Baruch Siach
2014-02-06  7:38         ` Baruch Siach
2014-02-06  8:28         ` Simon Horman
2014-02-06  8:28           ` Simon Horman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.