From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Brownell <dbrownell@users•sourceforge.net>,
Greg Kroah-Hartman <gregkh@suse•de>,
Jean Delvare <khali@linux-fr•org>,
H Hartley Sweeten <hartleys@visionengravers•com>,
Andrew Morton <akpm@linux-foundation•org>,
Artem Bityutskiy <Artem.Bityutskiy@nokia•com>
Subject: linux-next: manual merge of the mtd tree with the i2c tree
Date: Mon, 7 Sep 2009 13:36:21 +1000 [thread overview]
Message-ID: <20090907133621.3b4d4ce3.sfr@canb.auug.org.au> (raw)
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,
};
next reply other threads:[~2009-09-07 3:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-07 3:36 Stephen Rothwell [this message]
2009-09-08 16:52 ` linux-next: manual merge of the mtd tree with the i2c tree H Hartley Sweeten
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090907133621.3b4d4ce3.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Artem.Bityutskiy@nokia$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dbrownell@users$(echo .)sourceforge.net \
--cc=dwmw2@infradead$(echo .)org \
--cc=gregkh@suse$(echo .)de \
--cc=hartleys@visionengravers$(echo .)com \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox