Subject: [PATCH 1/7] Staging: move the position of the ipack source line in Kconfig

Moved the ipack source line to the proper place, at the end of the list in the
staging's Kconfig file.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 781cb98..d6417d11 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -24,8 +24,6 @@ menuconfig STAGING

if STAGING

-source "drivers/staging/ipack/Kconfig"
-
source "drivers/staging/et131x/Kconfig"

source "drivers/staging/slicoss/Kconfig"
@@ -130,4 +128,6 @@ source "drivers/staging/ramster/Kconfig"

source "drivers/staging/ozwpan/Kconfig"

+source "drivers/staging/ipack/Kconfig"
+
endif # STAGING
--
1.7.10


Subject: [PATCH 7/7] Staging ipack: added more info in Kconfig's help about ipack

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/Kconfig | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/ipack/Kconfig b/drivers/staging/ipack/Kconfig
index 4f4b9d6..af32178 100644
--- a/drivers/staging/ipack/Kconfig
+++ b/drivers/staging/ipack/Kconfig
@@ -5,7 +5,11 @@
menuconfig IPACK_BUS
tristate "IndustryPack bus support"
---help---
- If you say Y here you get support for the IndustryPack Framework.
+ If you say Y here you get support for the IndustryPack Framework
+ for drivers for many types of boards that support this industrial
+ bus. The IndustryPack Framework is a virtual bus allowing to
+ communicate between carrier and mezzanine cards connected through
+ this bus.

if IPACK_BUS

--
1.7.10

Subject: [PATCH 2/7] Staging: ipack: move the devices source line in Kconfig file

Maintain the proper order of definitions in Kconfig following the time order of
the commits.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/ipack/Kconfig b/drivers/staging/ipack/Kconfig
index 619c149..4f4b9d6 100644
--- a/drivers/staging/ipack/Kconfig
+++ b/drivers/staging/ipack/Kconfig
@@ -9,8 +9,8 @@ menuconfig IPACK_BUS

if IPACK_BUS

-source "drivers/staging/ipack/devices/Kconfig"
-
source "drivers/staging/ipack/bridges/Kconfig"

+source "drivers/staging/ipack/devices/Kconfig"
+
endif # IPACK
--
1.7.10

Subject: [PATCH 4/7] Staging: ipack: change the licence to explicitly GPLv2

Change the licence to explicitly GPLv2 to avoid possible conflicts in the
future.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/ipack.c | 3 +--
drivers/staging/ipack/ipack.h | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/ipack/ipack.c b/drivers/staging/ipack/ipack.c
index a54bfd7..ad06e06 100644
--- a/drivers/staging/ipack/ipack.c
+++ b/drivers/staging/ipack/ipack.c
@@ -6,8 +6,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h
index 41d6172..3aa38c5 100644
--- a/drivers/staging/ipack/ipack.h
+++ b/drivers/staging/ipack/ipack.h
@@ -6,8 +6,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#include <linux/device.h>
--
1.7.10

Subject: [PATCH 6/7] Staging: ipack/devices/ipoctal: change the licence to explicitly GPLv2

Change the licence to explicitly GPLv2 to avoid possible conflicts in the
future.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/devices/ipoctal.c | 3 +--
drivers/staging/ipack/devices/ipoctal.h | 3 +--
drivers/staging/ipack/devices/scc2698.h | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c
index 15c0c6b..a28c677 100644
--- a/drivers/staging/ipack/devices/ipoctal.c
+++ b/drivers/staging/ipack/devices/ipoctal.c
@@ -8,8 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/staging/ipack/devices/ipoctal.h
index 7c5d211..266f361 100644
--- a/drivers/staging/ipack/devices/ipoctal.h
+++ b/drivers/staging/ipack/devices/ipoctal.h
@@ -8,8 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#ifndef _IPOCTAL_H
diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/staging/ipack/devices/scc2698.h
index e683019..47f6269 100644
--- a/drivers/staging/ipack/devices/scc2698.h
+++ b/drivers/staging/ipack/devices/scc2698.h
@@ -8,8 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#ifndef SCC2698_H_
--
1.7.10

Subject: [PATCH 5/7] Staging: ipack/bridges/tpci200: change the licence to explicitly GPLv2

Change the licence to explicitly GPLv2 to avoid possible conflicts in the
future.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/bridges/tpci200.c | 3 +--
drivers/staging/ipack/bridges/tpci200.h | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c
index 08cd851..80cdd9e 100644
--- a/drivers/staging/ipack/bridges/tpci200.c
+++ b/drivers/staging/ipack/bridges/tpci200.c
@@ -8,8 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/staging/ipack/bridges/tpci200.h
index e452da2..75801f6 100644
--- a/drivers/staging/ipack/bridges/tpci200.h
+++ b/drivers/staging/ipack/bridges/tpci200.h
@@ -8,8 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Software Foundation; version 2 of the License.
*/

#ifndef _TPCI200_H_
--
1.7.10

Subject: [PATCH 3/7] Staging: ipack: add contact email in TODO file

Added myself in the TODO file.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/TODO | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/staging/ipack/TODO b/drivers/staging/ipack/TODO
index 11828ed..3a45a53 100644
--- a/drivers/staging/ipack/TODO
+++ b/drivers/staging/ipack/TODO
@@ -38,3 +38,9 @@ Ipack
way to unregistering mezzanine devices, doing the mezzanine driver a call to
remove_device() to notify the carrier driver, or the opposite with the call to
the ipack_driver_ops' remove() function could be improved.
+
+
+Contact
+=======
+
+Contact: Samuel Iglesias Gonsalvez <[email protected]>
\ No newline at end of file
--
1.7.10

2012-05-11 11:04:19

by Martyn Welch

[permalink] [raw]
Subject: Re: [PATCH 2/7] Staging: ipack: move the devices source line in Kconfig file

On 11/05/12 09:17, Samuel Iglesias Gonsalvez wrote:
> Maintain the proper order of definitions in Kconfig following the time order of
> the commits.
>

This could probably be rolled up into patch 1.

Martyn

> Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
> ---
> drivers/staging/ipack/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/ipack/Kconfig b/drivers/staging/ipack/Kconfig
> index 619c149..4f4b9d6 100644
> --- a/drivers/staging/ipack/Kconfig
> +++ b/drivers/staging/ipack/Kconfig
> @@ -9,8 +9,8 @@ menuconfig IPACK_BUS
>
> if IPACK_BUS
>
> -source "drivers/staging/ipack/devices/Kconfig"
> -
> source "drivers/staging/ipack/bridges/Kconfig"
>
> +source "drivers/staging/ipack/devices/Kconfig"
> +
> endif # IPACK


--
Martyn Welch (Lead Software Engineer) | Registered in England and Wales
GE Intelligent Platforms | (3828642) at 100 Barbirolli Square
T +44(0)1327322748 | Manchester, M2 3AB
E [email protected] | VAT:GB 927559189

2012-05-11 11:04:44

by Martyn Welch

[permalink] [raw]
Subject: Re: [PATCH 5/7] Staging: ipack/bridges/tpci200: change the licence to explicitly GPLv2

On 11/05/12 09:17, Samuel Iglesias Gonsalvez wrote:
> Change the licence to explicitly GPLv2 to avoid possible conflicts in the
> future.
>

This could probably be rolled up into patch 4.

Martyn

> Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
> ---
> drivers/staging/ipack/bridges/tpci200.c | 3 +--
> drivers/staging/ipack/bridges/tpci200.h | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c
> index 08cd851..80cdd9e 100644
> --- a/drivers/staging/ipack/bridges/tpci200.c
> +++ b/drivers/staging/ipack/bridges/tpci200.c
> @@ -8,8 +8,7 @@
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> + * Software Foundation; version 2 of the License.
> */
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/staging/ipack/bridges/tpci200.h
> index e452da2..75801f6 100644
> --- a/drivers/staging/ipack/bridges/tpci200.h
> +++ b/drivers/staging/ipack/bridges/tpci200.h
> @@ -8,8 +8,7 @@
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> + * Software Foundation; version 2 of the License.
> */
>
> #ifndef _TPCI200_H_


--
Martyn Welch (Lead Software Engineer) | Registered in England and Wales
GE Intelligent Platforms | (3828642) at 100 Barbirolli Square
T +44(0)1327322748 | Manchester, M2 3AB
E [email protected] | VAT:GB 927559189

2012-05-11 11:05:15

by Martyn Welch

[permalink] [raw]
Subject: Re: [PATCH 6/7] Staging: ipack/devices/ipoctal: change the licence to explicitly GPLv2

On 11/05/12 09:17, Samuel Iglesias Gonsalvez wrote:
> Change the licence to explicitly GPLv2 to avoid possible conflicts in the
> future.
>

This could also probably be rolled up into patch 4.

Martyn

> Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
> ---
> drivers/staging/ipack/devices/ipoctal.c | 3 +--
> drivers/staging/ipack/devices/ipoctal.h | 3 +--
> drivers/staging/ipack/devices/scc2698.h | 3 +--
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c
> index 15c0c6b..a28c677 100644
> --- a/drivers/staging/ipack/devices/ipoctal.c
> +++ b/drivers/staging/ipack/devices/ipoctal.c
> @@ -8,8 +8,7 @@
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> + * Software Foundation; version 2 of the License.
> */
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/staging/ipack/devices/ipoctal.h
> index 7c5d211..266f361 100644
> --- a/drivers/staging/ipack/devices/ipoctal.h
> +++ b/drivers/staging/ipack/devices/ipoctal.h
> @@ -8,8 +8,7 @@
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> + * Software Foundation; version 2 of the License.
> */
>
> #ifndef _IPOCTAL_H
> diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/staging/ipack/devices/scc2698.h
> index e683019..47f6269 100644
> --- a/drivers/staging/ipack/devices/scc2698.h
> +++ b/drivers/staging/ipack/devices/scc2698.h
> @@ -8,8 +8,7 @@
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> + * Software Foundation; version 2 of the License.
> */
>
> #ifndef SCC2698_H_


--
Martyn Welch (Lead Software Engineer) | Registered in England and Wales
GE Intelligent Platforms | (3828642) at 100 Barbirolli Square
T +44(0)1327322748 | Manchester, M2 3AB
E [email protected] | VAT:GB 927559189

2012-05-11 14:58:28

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 6/7] Staging: ipack/devices/ipoctal: change the licence to explicitly GPLv2

On Fri, May 11, 2012 at 12:05:09PM +0100, Martyn Welch wrote:
> On 11/05/12 09:17, Samuel Iglesias Gonsalvez wrote:
> > Change the licence to explicitly GPLv2 to avoid possible conflicts in the
> > future.
> >
>
> This could also probably be rolled up into patch 4.

That's ok, one patch per driver is fine.

thanks,

greg k-h

2012-05-11 14:59:03

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 2/7] Staging: ipack: move the devices source line in Kconfig file

On Fri, May 11, 2012 at 12:04:12PM +0100, Martyn Welch wrote:
> On 11/05/12 09:17, Samuel Iglesias Gonsalvez wrote:
> > Maintain the proper order of definitions in Kconfig following the time order of
> > the commits.
> >
>
> This could probably be rolled up into patch 1.

It could, but this is fine, they do two different things.

thanks,

greg k-h