* linux-next: manual merge of the mtd tree with the i2c tree
@ 2009-09-07 3:36 Stephen Rothwell
2009-09-08 16:52 ` H Hartley Sweeten
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-09-07 3:36 UTC (permalink / raw)
To: David Woodhouse
Cc: linux-next, linux-kernel, David Brownell, Greg Kroah-Hartman,
Jean Delvare, H Hartley Sweeten, Andrew Morton, Artem Bityutskiy
Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/mtdcore.c between commit
c6ce12828f9146f12d0654241bcb39523c257c90 ("driver model: constify
attribute groups") from the i2c tree and commit
fca910883324d437a24d447b08f524fa19261a94 ("mtd: make few symbols static")
from the mtd tree.
Just overlapping changes. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/mtd/mtdcore.c
index 69007a6,3f559c0..0000000
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -217,7 -217,7 +217,7 @@@ static struct attribute_group mtd_grou
.attrs = mtd_attrs,
};
- const struct attribute_group *mtd_groups[] = {
-static struct attribute_group *mtd_groups[] = {
++static const struct attribute_group *mtd_groups[] = {
&mtd_group,
NULL,
};
^ permalink raw reply [flat|nested] 2+ messages in thread
* RE: linux-next: manual merge of the mtd tree with the i2c tree
2009-09-07 3:36 linux-next: manual merge of the mtd tree with the i2c tree Stephen Rothwell
@ 2009-09-08 16:52 ` H Hartley Sweeten
0 siblings, 0 replies; 2+ messages in thread
From: H Hartley Sweeten @ 2009-09-08 16:52 UTC (permalink / raw)
To: Stephen Rothwell, David Woodhouse
Cc: linux-next, linux-kernel, David Brownell, Greg Kroah-Hartman,
Jean Delvare, Andrew Morton, Artem Bityutskiy
On Sunday, September 06, 2009 8:36 PM, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the mtd tree got a conflict in
> drivers/mtd/mtdcore.c between commit
> c6ce12828f9146f12d0654241bcb39523c257c90 ("driver model: constify
> attribute groups") from the i2c tree and commit
> fca910883324d437a24d447b08f524fa19261a94 ("mtd: make few symbols static")
> from the mtd tree.
>
> Just overlapping changes. I fixed it up (see below) and can carry the
> fix as necessary.
Acked-by: H Hartley Sweeten <hsweeten@visionengravers•com>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc drivers/mtd/mtdcore.c
> index 69007a6,3f559c0..0000000
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@@ -217,7 -217,7 +217,7 @@@ static struct attribute_group mtd_grou
> .attrs = mtd_attrs,
> };
>
> - const struct attribute_group *mtd_groups[] = {
> -static struct attribute_group *mtd_groups[] = {
> ++static const struct attribute_group *mtd_groups[] = {
> &mtd_group,
> NULL,
> };
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-08 16:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-07 3:36 linux-next: manual merge of the mtd tree with the i2c tree Stephen Rothwell
2009-09-08 16:52 ` H Hartley Sweeten
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox