From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the mtd tree with the i2c tree Date: Mon, 7 Sep 2009 13:36:21 +1000 Message-ID: <20090907133621.3b4d4ce3.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:35002 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbZIGDgZ (ORCPT ); Sun, 6 Sep 2009 23:36:25 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Woodhouse Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, 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, };