From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Brian Norris <computersforpeace@gmail•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa@the-dreams•de>,
Robert Jarzmik <robert.jarzmik@free•fr>
Subject: Re: linux-next: manual merge of the driver-core tree with the l2-mtd tree
Date: Mon, 10 Nov 2014 13:39:33 +0900 [thread overview]
Message-ID: <20141110043933.GB25797@kroah.com> (raw)
In-Reply-To: <20141110152801.221c4f5d@canb.auug.org.au>
On Mon, Nov 10, 2014 at 03:28:01PM +1100, Stephen Rothwell wrote:
> 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,
Looks good, thanks.
greg k-h
prev parent reply other threads:[~2014-11-10 4:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 4:28 linux-next: manual merge of the driver-core tree with the l2-mtd tree Stephen Rothwell
2014-11-10 4:39 ` Greg KH [this message]
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=20141110043933.GB25797@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=computersforpeace@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robert.jarzmik@free$(echo .)fr \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=wsa@the-dreams$(echo .)de \
/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