Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1202300

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

Show all headers | View raw

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-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the driver-core tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-07 07:30 +0200
  Re: linux-next: manual merge of the driver-core tree with Linus' tree Viresh Kumar <viresh.kumar@linaro.org> - 2015-08-07 07:40 +0200

csiph-web