linux-kernel - RE: linux-next: manual merge of the mtd tree with the i2c tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <BD79186B4FD85F4B8E60E381CAEE190901CBE901@mi8nycmail19.Mi8.com>
Date:	Tue, 8 Sep 2009 12:52:07 -0400
From:	"H Hartley Sweeten" <hartleys@...ionengravers.com>
To:	"Stephen Rothwell" <sfr@...b.auug.org.au>,
	"David Woodhouse" <dwmw2@...radead.org>
Cc:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"David Brownell" <dbrownell@...rs.sourceforge.net>,
	"Greg Kroah-Hartman" <gregkh@...e.de>,
	"Jean Delvare" <khali@...ux-fr.org>,
	"Andrew Morton" <akpm@...ux-foundation.org>,
	"Artem Bityutskiy" <Artem.Bityutskiy@...ia.com>
Subject: RE: linux-next: manual merge of the mtd tree with the i2c tree

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@...ionengravers.com>

> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.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,
>   };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/