From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Wolfram Sang <wsa@the-dreams.de>, Keerthy <j-keerthy@ti.com>,
Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the driver-core tree with the arm-soc tree
Date: Fri, 21 Nov 2014 16:41:31 +1100 [thread overview]
Message-ID: <20141121164131.0190e0ab@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 901 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/bus/omap_l3_noc.c between commit 61b43d4e919e ("bus:
omap_l3_noc: Add resume hook to restore context") from the arm-soc tree
and commit 571b8c6adb1b ("bus: 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/bus/omap_l3_noc.c
index 17d86595951c,1ff1863415c5..000000000000
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@@ -358,8 -300,6 +358,7 @@@ static struct platform_driver omap_l3_d
.probe = omap_l3_probe,
.driver = {
.name = "omap_l3_noc",
- .owner = THIS_MODULE,
+ .pm = L3_DEV_PM_OPS,
.of_match_table = of_match_ptr(l3_noc_match),
},
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-21 5:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 5:41 Stephen Rothwell [this message]
2014-11-21 11:05 ` linux-next: manual merge of the driver-core tree with the arm-soc tree Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2011-08-29 4:31 Stephen Rothwell
2011-08-29 19:33 ` 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=20141121164131.0190e0ab@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=j-keerthy@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=tony@atomide.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