On 07-08-15, 15:26, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/cpufreq/cpufreq.c
>
> between commit:
>
> 559ed40752dc ("cpufreq: Avoid attempts to create duplicate symbolic links")
>
> from Linus' tree and commit:
>
> 71db87ba5700 ("bus: subsys: update return type of ->remove_dev() to void")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks fine. Thanks.
--
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
