All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-19 18:02 ` Sebastian Hesselbarth
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-19 18:02 UTC (permalink / raw)
  To: Sebastian Hesselbarth
  Cc: Chris Ball, Ulf Hansson, Jason Cooper, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
---
Cc: Chris Ball <chris@printf.net>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/mmc/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 8aaf8c1f3f63..37665553ef33 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
 
 config MMC_SDHCI_DOVE
 	tristate "SDHCI support on Marvell's Dove SoC"
-	depends on ARCH_DOVE
+	depends on ARCH_DOVE || MACH_DOVE
 	depends on MMC_SDHCI_PLTFM
 	select MMC_SDHCI_IO_ACCESSORS
 	help
-- 
1.9.1


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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-19 18:02 ` Sebastian Hesselbarth
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-19 18:02 UTC (permalink / raw)
  To: linux-arm-kernel

DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
---
Cc: Chris Ball <chris@printf.net>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: linux-mmc at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
 drivers/mmc/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 8aaf8c1f3f63..37665553ef33 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
 
 config MMC_SDHCI_DOVE
 	tristate "SDHCI support on Marvell's Dove SoC"
-	depends on ARCH_DOVE
+	depends on ARCH_DOVE || MACH_DOVE
 	depends on MMC_SDHCI_PLTFM
 	select MMC_SDHCI_IO_ACCESSORS
 	help
-- 
1.9.1

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-19 18:02 ` Sebastian Hesselbarth
@ 2014-05-19 18:14   ` Andrew Lunn
  -1 siblings, 0 replies; 24+ messages in thread
From: Andrew Lunn @ 2014-05-19 18:14 UTC (permalink / raw)
  To: Sebastian Hesselbarth
  Cc: Andrew Lunn, Ulf Hansson, Jason Cooper, linux-mmc, Chris Ball,
	linux-kernel, Gregory Clement, linux-arm-kernel

On Mon, May 19, 2014 at 08:02:51PM +0200, Sebastian Hesselbarth wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>

Tested-by: Andrew Lunn <andrew@lunn.ch>

Thanks Sebastian

       Andrew

> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>  
>  config MMC_SDHCI_DOVE
>  	tristate "SDHCI support on Marvell's Dove SoC"
> -	depends on ARCH_DOVE
> +	depends on ARCH_DOVE || MACH_DOVE
>  	depends on MMC_SDHCI_PLTFM
>  	select MMC_SDHCI_IO_ACCESSORS
>  	help
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-19 18:14   ` Andrew Lunn
  0 siblings, 0 replies; 24+ messages in thread
From: Andrew Lunn @ 2014-05-19 18:14 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, May 19, 2014 at 08:02:51PM +0200, Sebastian Hesselbarth wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>

Tested-by: Andrew Lunn <andrew@lunn.ch>

Thanks Sebastian

       Andrew

> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc at vger.kernel.org
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>  
>  config MMC_SDHCI_DOVE
>  	tristate "SDHCI support on Marvell's Dove SoC"
> -	depends on ARCH_DOVE
> +	depends on ARCH_DOVE || MACH_DOVE
>  	depends on MMC_SDHCI_PLTFM
>  	select MMC_SDHCI_IO_ACCESSORS
>  	help
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-19 18:02 ` Sebastian Hesselbarth
@ 2014-05-22  8:12   ` Riku Voipio
  -1 siblings, 0 replies; 24+ messages in thread
From: Riku Voipio @ 2014-05-22  8:12 UTC (permalink / raw)
  To: linux-mmc, linux-arm-kernel, linux-kernel, Sebastian Hesselbarth

On Mon, May 19, 2014@08:02:51PM +0200, Sebastian Hesselbarth wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.

Dove cubox has usually rootfs on mmc, so this patch is very much needed
for using multiplatform kernel on dove cubox.

Tested-by: Riku Voipio <riku.voipio@iki.fi>

> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>  
>  config MMC_SDHCI_DOVE
>  	tristate "SDHCI support on Marvell's Dove SoC"
> -	depends on ARCH_DOVE
> +	depends on ARCH_DOVE || MACH_DOVE
>  	depends on MMC_SDHCI_PLTFM
>  	select MMC_SDHCI_IO_ACCESSORS
>  	help
> -- 
> 1.9.1
> 
> 

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-22  8:12   ` Riku Voipio
  0 siblings, 0 replies; 24+ messages in thread
From: Riku Voipio @ 2014-05-22  8:12 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, May 19, 2014 at 08:02:51PM +0200, Sebastian Hesselbarth wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.

Dove cubox has usually rootfs on mmc, so this patch is very much needed
for using multiplatform kernel on dove cubox.

Tested-by: Riku Voipio <riku.voipio@iki.fi>

> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc at vger.kernel.org
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>  
>  config MMC_SDHCI_DOVE
>  	tristate "SDHCI support on Marvell's Dove SoC"
> -	depends on ARCH_DOVE
> +	depends on ARCH_DOVE || MACH_DOVE
>  	depends on MMC_SDHCI_PLTFM
>  	select MMC_SDHCI_IO_ACCESSORS
>  	help
> -- 
> 1.9.1
> 
> 

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-19 18:02 ` Sebastian Hesselbarth
  (?)
@ 2014-05-22  9:09   ` Ulf Hansson
  -1 siblings, 0 replies; 24+ messages in thread
From: Ulf Hansson @ 2014-05-22  9:09 UTC (permalink / raw)
  To: Sebastian Hesselbarth
  Cc: Chris Ball, Jason Cooper, Andrew Lunn, Gregory Clement,
	linux-mmc, linux-arm-kernel, linux-kernel

On 19 May 2014 20:02, Sebastian Hesselbarth
<sebastian.hesselbarth@gmail.com> wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>

Thanks! Picked up for the PR I send to Chris.

Kind regards
Ulf Hansson

> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>
>  config MMC_SDHCI_DOVE
>         tristate "SDHCI support on Marvell's Dove SoC"
> -       depends on ARCH_DOVE
> +       depends on ARCH_DOVE || MACH_DOVE
>         depends on MMC_SDHCI_PLTFM
>         select MMC_SDHCI_IO_ACCESSORS
>         help
> --
> 1.9.1
>

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-22  9:09   ` Ulf Hansson
  0 siblings, 0 replies; 24+ messages in thread
From: Ulf Hansson @ 2014-05-22  9:09 UTC (permalink / raw)
  To: Sebastian Hesselbarth
  Cc: Chris Ball, Jason Cooper, Andrew Lunn, Gregory Clement,
	linux-mmc, linux-arm-kernel, linux-kernel

On 19 May 2014 20:02, Sebastian Hesselbarth
<sebastian.hesselbarth@gmail.com> wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>

Thanks! Picked up for the PR I send to Chris.

Kind regards
Ulf Hansson

> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>
>  config MMC_SDHCI_DOVE
>         tristate "SDHCI support on Marvell's Dove SoC"
> -       depends on ARCH_DOVE
> +       depends on ARCH_DOVE || MACH_DOVE
>         depends on MMC_SDHCI_PLTFM
>         select MMC_SDHCI_IO_ACCESSORS
>         help
> --
> 1.9.1
>

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-22  9:09   ` Ulf Hansson
  0 siblings, 0 replies; 24+ messages in thread
From: Ulf Hansson @ 2014-05-22  9:09 UTC (permalink / raw)
  To: linux-arm-kernel

On 19 May 2014 20:02, Sebastian Hesselbarth
<sebastian.hesselbarth@gmail.com> wrote:
> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Acked-by: Jason Cooper <jason@lakedaemon.net>

Thanks! Picked up for the PR I send to Chris.

Kind regards
Ulf Hansson

> ---
> Cc: Chris Ball <chris@printf.net>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-mmc at vger.kernel.org
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 8aaf8c1f3f63..37665553ef33 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX
>
>  config MMC_SDHCI_DOVE
>         tristate "SDHCI support on Marvell's Dove SoC"
> -       depends on ARCH_DOVE
> +       depends on ARCH_DOVE || MACH_DOVE
>         depends on MMC_SDHCI_PLTFM
>         select MMC_SDHCI_IO_ACCESSORS
>         help
> --
> 1.9.1
>

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-22  9:09   ` Ulf Hansson
  (?)
@ 2014-05-22 13:04     ` Sebastian Hesselbarth
  -1 siblings, 0 replies; 24+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-22 13:04 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Chris Ball, Jason Cooper, Andrew Lunn, Gregory Clement,
	linux-mmc, linux-arm-kernel, linux-kernel

On 05/22/2014 11:09 AM, Ulf Hansson wrote:
> On 19 May 2014 20:02, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> Thanks! Picked up for the PR I send to Chris.

Ulf, thanks for picking it up. I noticed it will now end up in v3.16
and not as a fix for v3.15. I'll come back to it, if v3.15 will
ever become a stable version ;)

Anyway, great you are helping Chris to pre-select the mmc patches!

Sebastian


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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-22 13:04     ` Sebastian Hesselbarth
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-22 13:04 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Chris Ball, Jason Cooper, Andrew Lunn, Gregory Clement,
	linux-mmc, linux-arm-kernel, linux-kernel

On 05/22/2014 11:09 AM, Ulf Hansson wrote:
> On 19 May 2014 20:02, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> Thanks! Picked up for the PR I send to Chris.

Ulf, thanks for picking it up. I noticed it will now end up in v3.16
and not as a fix for v3.15. I'll come back to it, if v3.15 will
ever become a stable version ;)

Anyway, great you are helping Chris to pre-select the mmc patches!

Sebastian


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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-22 13:04     ` Sebastian Hesselbarth
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-22 13:04 UTC (permalink / raw)
  To: linux-arm-kernel

On 05/22/2014 11:09 AM, Ulf Hansson wrote:
> On 19 May 2014 20:02, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> Thanks! Picked up for the PR I send to Chris.

Ulf, thanks for picking it up. I noticed it will now end up in v3.16
and not as a fix for v3.15. I'll come back to it, if v3.15 will
ever become a stable version ;)

Anyway, great you are helping Chris to pre-select the mmc patches!

Sebastian

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-22  9:09   ` Ulf Hansson
  (?)
@ 2014-05-23  7:16     ` Olof Johansson
  -1 siblings, 0 replies; 24+ messages in thread
From: Olof Johansson @ 2014-05-23  7:16 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Sebastian Hesselbarth, Chris Ball, Jason Cooper, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 19 May 2014 20:02, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> Thanks! Picked up for the PR I send to Chris.

Ulf, you might consider adding your tree to linux-next if this is
going to be a common work flow for you guys.

It's partially up to Chris though, if he's OK with patches going into
your branch more or less being guaranteed to make it into his as well.


-Olof

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23  7:16     ` Olof Johansson
  0 siblings, 0 replies; 24+ messages in thread
From: Olof Johansson @ 2014-05-23  7:16 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Sebastian Hesselbarth, Chris Ball, Jason Cooper, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 19 May 2014 20:02, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> Thanks! Picked up for the PR I send to Chris.

Ulf, you might consider adding your tree to linux-next if this is
going to be a common work flow for you guys.

It's partially up to Chris though, if he's OK with patches going into
your branch more or less being guaranteed to make it into his as well.


-Olof

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23  7:16     ` Olof Johansson
  0 siblings, 0 replies; 24+ messages in thread
From: Olof Johansson @ 2014-05-23  7:16 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 19 May 2014 20:02, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> Thanks! Picked up for the PR I send to Chris.

Ulf, you might consider adding your tree to linux-next if this is
going to be a common work flow for you guys.

It's partially up to Chris though, if he's OK with patches going into
your branch more or less being guaranteed to make it into his as well.


-Olof

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-23  7:16     ` Olof Johansson
  (?)
@ 2014-05-23  7:40       ` Ulf Hansson
  -1 siblings, 0 replies; 24+ messages in thread
From: Ulf Hansson @ 2014-05-23  7:40 UTC (permalink / raw)
  To: Olof Johansson
  Cc: Sebastian Hesselbarth, Chris Ball, Jason Cooper, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
> On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> On 19 May 2014 20:02, Sebastian Hesselbarth
>> <sebastian.hesselbarth@gmail.com> wrote:
>>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>>
>>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>>
>> Thanks! Picked up for the PR I send to Chris.
>
> Ulf, you might consider adding your tree to linux-next if this is
> going to be a common work flow for you guys.

That's done already. :-) There are patches which makes this visible in
the MAINTAINERS as well, queued for 3.16.

git://git.linaro.org/people/ulf.hansson/mmc.git next

Though due to merge conflicts, during this release cycle, I didn't
want to queue any patches besides for the mmci host driver.

>
> It's partially up to Chris though, if he's OK with patches going into
> your branch more or less being guaranteed to make it into his as well.
>

Yes, we need to figure out a good work flow when using two separate
trees. Thanks for bringing this up!

Kind regards
Ulf Hansson

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23  7:40       ` Ulf Hansson
  0 siblings, 0 replies; 24+ messages in thread
From: Ulf Hansson @ 2014-05-23  7:40 UTC (permalink / raw)
  To: Olof Johansson
  Cc: Sebastian Hesselbarth, Chris Ball, Jason Cooper, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
> On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> On 19 May 2014 20:02, Sebastian Hesselbarth
>> <sebastian.hesselbarth@gmail.com> wrote:
>>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>>
>>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>>
>> Thanks! Picked up for the PR I send to Chris.
>
> Ulf, you might consider adding your tree to linux-next if this is
> going to be a common work flow for you guys.

That's done already. :-) There are patches which makes this visible in
the MAINTAINERS as well, queued for 3.16.

git://git.linaro.org/people/ulf.hansson/mmc.git next

Though due to merge conflicts, during this release cycle, I didn't
want to queue any patches besides for the mmci host driver.

>
> It's partially up to Chris though, if he's OK with patches going into
> your branch more or less being guaranteed to make it into his as well.
>

Yes, we need to figure out a good work flow when using two separate
trees. Thanks for bringing this up!

Kind regards
Ulf Hansson

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23  7:40       ` Ulf Hansson
  0 siblings, 0 replies; 24+ messages in thread
From: Ulf Hansson @ 2014-05-23  7:40 UTC (permalink / raw)
  To: linux-arm-kernel

On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
> On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> On 19 May 2014 20:02, Sebastian Hesselbarth
>> <sebastian.hesselbarth@gmail.com> wrote:
>>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>>>
>>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>>
>> Thanks! Picked up for the PR I send to Chris.
>
> Ulf, you might consider adding your tree to linux-next if this is
> going to be a common work flow for you guys.

That's done already. :-) There are patches which makes this visible in
the MAINTAINERS as well, queued for 3.16.

git://git.linaro.org/people/ulf.hansson/mmc.git next

Though due to merge conflicts, during this release cycle, I didn't
want to queue any patches besides for the mmci host driver.

>
> It's partially up to Chris though, if he's OK with patches going into
> your branch more or less being guaranteed to make it into his as well.
>

Yes, we need to figure out a good work flow when using two separate
trees. Thanks for bringing this up!

Kind regards
Ulf Hansson

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-23  7:40       ` Ulf Hansson
  (?)
@ 2014-05-23 13:41         ` Jason Cooper
  -1 siblings, 0 replies; 24+ messages in thread
From: Jason Cooper @ 2014-05-23 13:41 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Olof Johansson, Sebastian Hesselbarth, Chris Ball, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> >> On 19 May 2014 20:02, Sebastian Hesselbarth
> >> <sebastian.hesselbarth@gmail.com> wrote:
> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
> >>>
> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >>> Acked-by: Jason Cooper <jason@lakedaemon.net>
> >>
> >> Thanks! Picked up for the PR I send to Chris.
> >
> > Ulf, you might consider adding your tree to linux-next if this is
> > going to be a common work flow for you guys.
> 
> That's done already. :-) There are patches which makes this visible in
> the MAINTAINERS as well, queued for 3.16.
> 
> git://git.linaro.org/people/ulf.hansson/mmc.git next
> 
> Though due to merge conflicts, during this release cycle, I didn't
> want to queue any patches besides for the mmci host driver.
> 
> >
> > It's partially up to Chris though, if he's OK with patches going into
> > your branch more or less being guaranteed to make it into his as well.
> >
> 
> Yes, we need to figure out a good work flow when using two separate
> trees. Thanks for bringing this up!

If you have any questions, please ask.  mvebu has been doing this for
several release cycles now, and I'm also doing it for irqchip now.

The biggest rule is that once you sign a tag and send a pull-request for
it, the branch is immutable up to and including that tag.

thx,

Jason.

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23 13:41         ` Jason Cooper
  0 siblings, 0 replies; 24+ messages in thread
From: Jason Cooper @ 2014-05-23 13:41 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Olof Johansson, Sebastian Hesselbarth, Chris Ball, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> >> On 19 May 2014 20:02, Sebastian Hesselbarth
> >> <sebastian.hesselbarth@gmail.com> wrote:
> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
> >>>
> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >>> Acked-by: Jason Cooper <jason@lakedaemon.net>
> >>
> >> Thanks! Picked up for the PR I send to Chris.
> >
> > Ulf, you might consider adding your tree to linux-next if this is
> > going to be a common work flow for you guys.
> 
> That's done already. :-) There are patches which makes this visible in
> the MAINTAINERS as well, queued for 3.16.
> 
> git://git.linaro.org/people/ulf.hansson/mmc.git next
> 
> Though due to merge conflicts, during this release cycle, I didn't
> want to queue any patches besides for the mmci host driver.
> 
> >
> > It's partially up to Chris though, if he's OK with patches going into
> > your branch more or less being guaranteed to make it into his as well.
> >
> 
> Yes, we need to figure out a good work flow when using two separate
> trees. Thanks for bringing this up!

If you have any questions, please ask.  mvebu has been doing this for
several release cycles now, and I'm also doing it for irqchip now.

The biggest rule is that once you sign a tag and send a pull-request for
it, the branch is immutable up to and including that tag.

thx,

Jason.

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23 13:41         ` Jason Cooper
  0 siblings, 0 replies; 24+ messages in thread
From: Jason Cooper @ 2014-05-23 13:41 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> >> On 19 May 2014 20:02, Sebastian Hesselbarth
> >> <sebastian.hesselbarth@gmail.com> wrote:
> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
> >>>
> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >>> Acked-by: Jason Cooper <jason@lakedaemon.net>
> >>
> >> Thanks! Picked up for the PR I send to Chris.
> >
> > Ulf, you might consider adding your tree to linux-next if this is
> > going to be a common work flow for you guys.
> 
> That's done already. :-) There are patches which makes this visible in
> the MAINTAINERS as well, queued for 3.16.
> 
> git://git.linaro.org/people/ulf.hansson/mmc.git next
> 
> Though due to merge conflicts, during this release cycle, I didn't
> want to queue any patches besides for the mmci host driver.
> 
> >
> > It's partially up to Chris though, if he's OK with patches going into
> > your branch more or less being guaranteed to make it into his as well.
> >
> 
> Yes, we need to figure out a good work flow when using two separate
> trees. Thanks for bringing this up!

If you have any questions, please ask.  mvebu has been doing this for
several release cycles now, and I'm also doing it for irqchip now.

The biggest rule is that once you sign a tag and send a pull-request for
it, the branch is immutable up to and including that tag.

thx,

Jason.

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
  2014-05-23 13:41         ` Jason Cooper
  (?)
@ 2014-05-23 16:26           ` Olof Johansson
  -1 siblings, 0 replies; 24+ messages in thread
From: Olof Johansson @ 2014-05-23 16:26 UTC (permalink / raw)
  To: Jason Cooper
  Cc: Ulf Hansson, Sebastian Hesselbarth, Chris Ball, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On Fri, May 23, 2014 at 6:41 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
>> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
>> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> >> On 19 May 2014 20:02, Sebastian Hesselbarth
>> >> <sebastian.hesselbarth@gmail.com> wrote:
>> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>> >>>
>> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> >>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>> >>
>> >> Thanks! Picked up for the PR I send to Chris.
>> >
>> > Ulf, you might consider adding your tree to linux-next if this is
>> > going to be a common work flow for you guys.
>>
>> That's done already. :-) There are patches which makes this visible in
>> the MAINTAINERS as well, queued for 3.16.
>>
>> git://git.linaro.org/people/ulf.hansson/mmc.git next
>>
>> Though due to merge conflicts, during this release cycle, I didn't
>> want to queue any patches besides for the mmci host driver.
>>
>> >
>> > It's partially up to Chris though, if he's OK with patches going into
>> > your branch more or less being guaranteed to make it into his as well.
>> >
>>
>> Yes, we need to figure out a good work flow when using two separate
>> trees. Thanks for bringing this up!
>
> If you have any questions, please ask.  mvebu has been doing this for
> several release cycles now, and I'm also doing it for irqchip now.
>
> The biggest rule is that once you sign a tag and send a pull-request for
> it, the branch is immutable up to and including that tag.

...unless you get asked to respin based on review from the person
you're sending the request to.

This is the main problem with multi-level maintainer trees: It's hard
to run a stable non-rebasing tree as a downstream tree since there's
no actual guarantee that it'll go in as-is.


-Olof

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

* Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23 16:26           ` Olof Johansson
  0 siblings, 0 replies; 24+ messages in thread
From: Olof Johansson @ 2014-05-23 16:26 UTC (permalink / raw)
  To: Jason Cooper
  Cc: Ulf Hansson, Sebastian Hesselbarth, Chris Ball, Andrew Lunn,
	Gregory Clement, linux-mmc, linux-arm-kernel, linux-kernel

On Fri, May 23, 2014 at 6:41 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
>> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
>> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> >> On 19 May 2014 20:02, Sebastian Hesselbarth
>> >> <sebastian.hesselbarth@gmail.com> wrote:
>> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>> >>>
>> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> >>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>> >>
>> >> Thanks! Picked up for the PR I send to Chris.
>> >
>> > Ulf, you might consider adding your tree to linux-next if this is
>> > going to be a common work flow for you guys.
>>
>> That's done already. :-) There are patches which makes this visible in
>> the MAINTAINERS as well, queued for 3.16.
>>
>> git://git.linaro.org/people/ulf.hansson/mmc.git next
>>
>> Though due to merge conflicts, during this release cycle, I didn't
>> want to queue any patches besides for the mmci host driver.
>>
>> >
>> > It's partially up to Chris though, if he's OK with patches going into
>> > your branch more or less being guaranteed to make it into his as well.
>> >
>>
>> Yes, we need to figure out a good work flow when using two separate
>> trees. Thanks for bringing this up!
>
> If you have any questions, please ask.  mvebu has been doing this for
> several release cycles now, and I'm also doing it for irqchip now.
>
> The biggest rule is that once you sign a tag and send a pull-request for
> it, the branch is immutable up to and including that tag.

...unless you get asked to respin based on review from the person
you're sending the request to.

This is the main problem with multi-level maintainer trees: It's hard
to run a stable non-rebasing tree as a downstream tree since there's
no actual guarantee that it'll go in as-is.


-Olof

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

* [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency
@ 2014-05-23 16:26           ` Olof Johansson
  0 siblings, 0 replies; 24+ messages in thread
From: Olof Johansson @ 2014-05-23 16:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, May 23, 2014 at 6:41 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
>> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote:
>> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> >> On 19 May 2014 20:02, Sebastian Hesselbarth
>> >> <sebastian.hesselbarth@gmail.com> wrote:
>> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
>> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
>> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
>> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
>> >>>
>> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> >>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>> >>
>> >> Thanks! Picked up for the PR I send to Chris.
>> >
>> > Ulf, you might consider adding your tree to linux-next if this is
>> > going to be a common work flow for you guys.
>>
>> That's done already. :-) There are patches which makes this visible in
>> the MAINTAINERS as well, queued for 3.16.
>>
>> git://git.linaro.org/people/ulf.hansson/mmc.git next
>>
>> Though due to merge conflicts, during this release cycle, I didn't
>> want to queue any patches besides for the mmci host driver.
>>
>> >
>> > It's partially up to Chris though, if he's OK with patches going into
>> > your branch more or less being guaranteed to make it into his as well.
>> >
>>
>> Yes, we need to figure out a good work flow when using two separate
>> trees. Thanks for bringing this up!
>
> If you have any questions, please ask.  mvebu has been doing this for
> several release cycles now, and I'm also doing it for irqchip now.
>
> The biggest rule is that once you sign a tag and send a pull-request for
> it, the branch is immutable up to and including that tag.

...unless you get asked to respin based on review from the person
you're sending the request to.

This is the main problem with multi-level maintainer trees: It's hard
to run a stable non-rebasing tree as a downstream tree since there's
no actual guarantee that it'll go in as-is.


-Olof

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

end of thread, other threads:[~2014-05-23 16:26 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-19 18:02 [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency Sebastian Hesselbarth
2014-05-19 18:02 ` Sebastian Hesselbarth
2014-05-19 18:14 ` Andrew Lunn
2014-05-19 18:14   ` Andrew Lunn
2014-05-22  8:12 ` Riku Voipio
2014-05-22  8:12   ` Riku Voipio
2014-05-22  9:09 ` Ulf Hansson
2014-05-22  9:09   ` Ulf Hansson
2014-05-22  9:09   ` Ulf Hansson
2014-05-22 13:04   ` Sebastian Hesselbarth
2014-05-22 13:04     ` Sebastian Hesselbarth
2014-05-22 13:04     ` Sebastian Hesselbarth
2014-05-23  7:16   ` Olof Johansson
2014-05-23  7:16     ` Olof Johansson
2014-05-23  7:16     ` Olof Johansson
2014-05-23  7:40     ` Ulf Hansson
2014-05-23  7:40       ` Ulf Hansson
2014-05-23  7:40       ` Ulf Hansson
2014-05-23 13:41       ` Jason Cooper
2014-05-23 13:41         ` Jason Cooper
2014-05-23 13:41         ` Jason Cooper
2014-05-23 16:26         ` Olof Johansson
2014-05-23 16:26           ` Olof Johansson
2014-05-23 16:26           ` Olof Johansson

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.