Messages in this thread | | | Date | Wed, 30 Jul 2014 15:35:59 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the clk tree with the driver-core tree |
| |
On Wed, Jul 30, 2014 at 06:57:08PM +1000, Stephen Rothwell wrote: > Hi Mike, > > Today's linux-next merge of the clk tree got a conflict in > drivers/base/platform.c between commit 3d713e0e382e ("driver core: > platform: add device binding path 'driver_override'") from the > driver-core tree and commit 86be408bfbd8 ("clk: Support for clock > parents and rates assigned from device tree") from the clk tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |