linux-next: manual merge of the driver-core tree with the watchdog tree

linux-next: manual merge of the driver-core tree with the watchdog tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 908 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/watchdog/imx2_wdt.c between commit 6dc21678dbd9 ("watchdog:
imx2_wdt: Add power management support") from the watchdog tree and
commit fa21a580dea4 ("watchdog: 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/watchdog/imx2_wdt.c
index b333283b24a7,65b84d8c0b93..000000000000
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@@ -383,8 -337,6 +383,7 @@@ static struct platform_driver imx2_wdt_
  	.shutdown	= imx2_wdt_shutdown,
  	.driver		= {
  		.name	= DRIVER_NAME,
- 		.owner	= THIS_MODULE,
 +		.pm     = &imx2_wdt_pm_ops,
  		.of_match_table = imx2_wdt_dt_ids,
  	},
  };

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with the watchdog tree

[Greg KH]

On Mon, Dec 15, 2014 at 02:11:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/watchdog/imx2_wdt.c between commit 6dc21678dbd9 ("watchdog:
> imx2_wdt: Add power management support") from the watchdog tree and
> commit fa21a580dea4 ("watchdog: 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).

How is this happening, nothing has changed in my trees, did something
new get added to the watchdog tree?

thanks,

greg k-h

Re: linux-next: manual merge of the driver-core tree with the watchdog tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

Hi Greg,

On Sun, 14 Dec 2014 20:35:06 -0800 Greg KH <greg@kroah.com> wrote:
>
> How is this happening, nothing has changed in my trees, did something
> new get added to the watchdog tree?

Yep.

It would have been much easier on me (and maybe Linus) if those "drop
owner assignment from platform_drivers" patches had gone via their
respective maintainers ... just something to remember for next time.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with the watchdog tree

[Greg KH]

On Mon, Dec 15, 2014 at 04:09:09PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Sun, 14 Dec 2014 20:35:06 -0800 Greg KH <greg@kroah.com> wrote:
> >
> > How is this happening, nothing has changed in my trees, did something
> > new get added to the watchdog tree?
> 
> Yep.
> 
> It would have been much easier on me (and maybe Linus) if those "drop
> owner assignment from platform_drivers" patches had gone via their
> respective maintainers ... just something to remember for next time.

Yeah, sorry, I'll do that next time, my fault.

greg k-h