From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Simon Horman <horms@verge.net.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pawel Moll <pawel.moll@arm.com>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the renesas tree
Date: Sun, 27 Jul 2014 23:09:35 -0700 [thread overview]
Message-ID: <20140728060935.GA753@kroah.com> (raw)
In-Reply-To: <20140725162353.04cacc71@canb.auug.org.au>
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
prev parent reply other threads:[~2014-07-28 6:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140728060935.GA753@kroah.com \
--to=greg@kroah.com \
--cc=horms@verge.net.au \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pawel.moll@arm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.