From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Wolfram Sang <wsa@the-dreams.de>, Aaron Lu <aaron.lu@intel.com>
Subject: linux-next: manual merge of the driver-core tree with the pm tree
Date: Mon, 10 Nov 2014 15:18:56 +1100 [thread overview]
Message-ID: <20141110151856.0b644fb3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
("input: gpio_keys_polled: Make use of device property API") from the
pm tree and commit 1d05726c315c ("input: keyboard: 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/input/keyboard/gpio_keys_polled.c
index c9c1c8ca7267,10f0098f3c77..000000000000
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@@ -297,8 -307,7 +297,7 @@@ static struct platform_driver gpio_keys
.probe = gpio_keys_polled_probe,
.driver = {
.name = DRV_NAME,
- .owner = THIS_MODULE,
- .of_match_table = of_match_ptr(gpio_keys_polled_of_match),
+ .of_match_table = gpio_keys_polled_of_match,
},
};
module_platform_driver(gpio_keys_polled_driver);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 4:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 4:18 Stephen Rothwell [this message]
2014-11-10 4:40 ` linux-next: manual merge of the driver-core tree with the pm tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 8:32 Stephen Rothwell
2019-07-03 13:04 ` Andy Shevchenko
2018-12-10 5:14 Stephen Rothwell
2018-12-10 8:58 ` Rafael J. Wysocki
2018-12-10 9:02 ` Andy Shevchenko
2016-11-14 2:09 Stephen Rothwell
2016-11-14 21:07 ` Rafael J. Wysocki
2014-11-11 4:41 Stephen Rothwell
2014-12-02 18:10 ` Greg KH
2013-08-30 5:26 Stephen Rothwell
2013-08-30 6:02 ` Greg KH
2013-06-27 7:14 Stephen Rothwell
2013-06-27 15:36 ` Greg KH
2013-06-07 4:49 Stephen Rothwell
2013-06-07 17:38 ` Greg KH
2013-05-22 3:47 Stephen Rothwell
2013-05-22 4:02 ` Stephen Rothwell
2013-05-22 11:26 ` Rafael J. Wysocki
2013-02-11 4:42 Stephen Rothwell
2013-02-11 12:10 ` Rafael J. Wysocki
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=20141110151856.0b644fb3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aaron.lu@intel.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--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).