Messages in this thread | | | Date | Sun, 27 Jul 2014 23:09:35 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the renesas tree |
| |
On Fri, Jul 25, 2014 at 04:23:53PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/arm/mach-shmobile/setup-r7s72100.c between commit 9394af431455 > ("ARM: shmobile: genmai-reference: Enable MTU2 in device tree") from > the renesas tree and commit d2168146c222 ("platform: Remove most > references to platform_bus device") from the driver-core tree. > > I fixed it up (the former removed the code that the latter modified) > and can carry the fix as necessary (no action is required).
Sounds good, thanks.
greg k-h
| |