* linux-next: manual merge of the driver-core tree with the tree
@ 2014-11-10 4:21 Stephen Rothwell
2014-11-10 4:36 ` Stephen Rothwell
2014-11-10 4:40 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-11-10 4:21 UTC (permalink / raw)
To: Greg KH, Rafael J. Wysocki
Cc: linux-next, linux-kernel, Wolfram Sang, Mika Westerberg
[-- Attachment #1: Type: text/plain, Size: 912 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio:
Make use of device property API") from the tree and commit
81902d5f658f ("leds: 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/leds/leds-gpio.c
index b3c5d9d6a42b,ac4768f2b2b4..000000000000
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@@ -281,8 -287,7 +281,7 @@@ static struct platform_driver gpio_led_
.remove = gpio_led_remove,
.driver = {
.name = "leds-gpio",
- .owner = THIS_MODULE,
- .of_match_table = of_match_ptr(of_gpio_leds_match),
+ .of_match_table = of_gpio_leds_match,
},
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tree
2014-11-10 4:21 linux-next: manual merge of the driver-core tree with the tree Stephen Rothwell
@ 2014-11-10 4:36 ` Stephen Rothwell
2014-11-10 4:40 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-11-10 4:36 UTC (permalink / raw)
To: Greg KH, Rafael J. Wysocki
Cc: linux-next, linux-kernel, Wolfram Sang, Mika Westerberg
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Hi all,
On Mon, 10 Nov 2014 15:21:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio:
> Make use of device property API") from the tree and commit
> 81902d5f658f ("leds: drop owner assignment from platform_drivers") from
> the driver-core tree.
This involved the pm tree, of course.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tree
2014-11-10 4:21 linux-next: manual merge of the driver-core tree with the tree Stephen Rothwell
2014-11-10 4:36 ` Stephen Rothwell
@ 2014-11-10 4:40 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2014-11-10 4:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafael J. Wysocki, linux-next, linux-kernel, Wolfram Sang,
Mika Westerberg
On Mon, Nov 10, 2014 at 03:21:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio:
> Make use of device property API") from the tree and commit
> 81902d5f658f ("leds: 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/leds/leds-gpio.c
> index b3c5d9d6a42b,ac4768f2b2b4..000000000000
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@@ -281,8 -287,7 +281,7 @@@ static struct platform_driver gpio_led_
> .remove = gpio_led_remove,
> .driver = {
> .name = "leds-gpio",
> - .owner = THIS_MODULE,
> - .of_match_table = of_match_ptr(of_gpio_leds_match),
> + .of_match_table = of_gpio_leds_match,
> },
> };
>
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tree
2013-02-15 5:24 ` Greg KH
@ 2013-02-15 17:04 ` Larry Finger
0 siblings, 0 replies; 6+ messages in thread
From: Larry Finger @ 2013-02-15 17:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Kees Cook, John W. Linville
On 02/14/2013 11:24 PM, Greg KH wrote:
> On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the driver-core tree got a conflict in
>> drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30
>> ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit
>> 6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on
>> CONFIG_EXPERIMENTAL") from the driver-core tree.
>>
>> I fixed it up (the former is a superset of the latter, so I used that)
>> and can carry the fix as necessary (no action is required).
>
> That sounds fine, thanks.
I agree. Sorry for any conflict.
Thanks,
Larry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tree
2013-02-15 5:01 Stephen Rothwell
@ 2013-02-15 5:24 ` Greg KH
2013-02-15 17:04 ` Larry Finger
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2013-02-15 5:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Kees Cook, Larry Finger, John W. Linville
On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30
> ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit
> 6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on
> CONFIG_EXPERIMENTAL") from the driver-core tree.
>
> I fixed it up (the former is a superset of the latter, so I used that)
> and can carry the fix as necessary (no action is required).
That sounds fine, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the driver-core tree with the tree
@ 2013-02-15 5:01 Stephen Rothwell
2013-02-15 5:24 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-02-15 5:01 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Kees Cook, Larry Finger, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30
("rtlwifi: Rework Kconfig") from the wireless-next tree and commit
6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on
CONFIG_EXPERIMENTAL") from the driver-core tree.
I fixed it up (the former is a superset of the latter, so I used that)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-10 4:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-10 4:21 linux-next: manual merge of the driver-core tree with the tree Stephen Rothwell
2014-11-10 4:36 ` Stephen Rothwell
2014-11-10 4:40 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-02-15 5:01 Stephen Rothwell
2013-02-15 5:24 ` Greg KH
2013-02-15 17:04 ` Larry Finger
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).