From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa@the-dreams•de>,
Chris Zhong <zyw@rock-chips•com>
Subject: linux-next: manual merge of the pinctrl tree with the driver-core tree
Date: Mon, 10 Nov 2014 17:29:21 +1100 [thread overview]
Message-ID: <20141110172921.1e2c12d9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 960 bytes --]
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/pinctrl-rockchip.c between commit 9198f509c888
("pinctrl: rockchip: add suspend/resume functions") from the
driver-core tree and commit 5c759d73b022 ("pinctrl: drop owner
assignment from platform_drivers") from the pinctrl 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/pinctrl/pinctrl-rockchip.c
index 71d5835d864b,40970c305dd0..000000000000
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@@ -1982,6 -2053,8 +2053,7 @@@ static struct platform_driver rockchip_
.probe = rockchip_pinctrl_probe,
.driver = {
.name = "rockchip-pinctrl",
- .owner = THIS_MODULE,
+ .pm = &rockchip_pinctrl_dev_pm_ops,
.of_match_table = rockchip_pinctrl_dt_match,
},
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 6:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 6:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-23 4:58 linux-next: manual merge of the pinctrl tree with the driver-core tree Stephen Rothwell
2013-01-23 5:03 ` Greg KH
2013-01-23 8:28 ` Linus Walleij
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=20141110172921.1e2c12d9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wsa@the-dreams$(echo .)de \
--cc=zyw@rock-chips$(echo .)com \
/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