From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Brian Norris <computersforpeace@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Wolfram Sang <wsa@the-dreams.de>,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: linux-next: manual merge of the driver-core tree with the l2-mtd tree
Date: Mon, 10 Nov 2014 15:28:01 +1100 [thread overview]
Message-ID: <20141110152801.221c4f5d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 937 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/mtd/devices/docg3.c between commit a59459f29fb7 ("mtd: docg3:
add device-tree support") from the l2-mtd tree and commit c37c1e160546
("mtd: devices: drop owner assignment from platform_drivers") from the
driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/mtd/devices/docg3.c
index 0d9d3ee68b61,72346048532d..000000000000
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@@ -2130,8 -2129,6 +2130,7 @@@ MODULE_DEVICE_TABLE(of, docg3_dt_ids)
static struct platform_driver g3_driver = {
.driver = {
.name = "docg3",
- .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(docg3_dt_ids),
},
.suspend = docg3_suspend,
.resume = docg3_resume,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 4:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 4:28 Stephen Rothwell [this message]
2014-11-10 4:39 ` linux-next: manual merge of the driver-core tree with the l2-mtd tree Greg KH
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=20141110152801.221c4f5d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=computersforpeace@gmail.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robert.jarzmik@free.fr \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).