* linux-next: manual merge of the driver-core tree with the renesas tree
@ 2014-07-25 6:23 Stephen Rothwell
2014-07-28 6:09 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-07-25 6:23 UTC (permalink / raw)
To: Greg KH, Simon Horman
Cc: linux-next, linux-kernel, Pawel Moll, Laurent Pinchart
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the renesas tree
2014-07-25 6:23 linux-next: manual merge of the driver-core tree with the renesas tree Stephen Rothwell
@ 2014-07-28 6:09 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2014-07-28 6:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simon Horman, linux-next, linux-kernel, Pawel Moll,
Laurent Pinchart
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-28 6:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-25 6:23 linux-next: manual merge of the driver-core tree with the renesas tree Stephen Rothwell
2014-07-28 6:09 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox