From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Lee Jones <lee.jones@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pankaj Dubey <pankaj.dubey@samsung.com>,
Wolfram Sang <wsa@the-dreams.de>
Subject: linux-next: manual merge of the driver-core tree with the mfd tree
Date: Mon, 10 Nov 2014 15:24:26 +1100 [thread overview]
Message-ID: <20141110152426.7f1f3da8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 911 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon:
Decouple syscon interface from platform devices") from the mfd tree and
commit 78a835416ad6 ("mfd: 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/mfd/syscon.c
index 72373b113885,e85c052b302c..000000000000
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id
static struct platform_driver syscon_driver = {
.driver = {
.name = "syscon",
- .owner = THIS_MODULE,
- .of_match_table = of_syscon_match,
},
.probe = syscon_probe,
.id_table = syscon_ids,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 4:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 4:24 Stephen Rothwell [this message]
2014-11-10 4:39 ` linux-next: manual merge of the driver-core tree with the mfd tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 4:18 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:00 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:57 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:50 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:47 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:43 Stephen Rothwell
2012-11-29 5:21 ` Greg KH
2010-09-14 2:25 Stephen Rothwell
2010-09-14 4:09 ` 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=20141110152426.7f1f3da8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pankaj.dubey@samsung.com \
--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).