From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thierry Reding <thierry.reding@avionic-design•de>,
Jingoo Han <jg1.han@samsung•com>,
Grant Likely <grant.likely@secretlab•ca>
Subject: Re: linux-next: manual merge of the driver-core tree with the spi tree
Date: Tue, 5 Feb 2013 22:03:44 -0800 [thread overview]
Message-ID: <20130206060344.GB3352@kroah.com> (raw)
In-Reply-To: <20130206162151.73f40e71f5103e33c19c4c49@canb.auug.org.au>
On Wed, Feb 06, 2013 at 04:21:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in drivers/spi/spi-s3c64xx.c between commit 4eb770067f3a ("spi/s3c64xx: Use devm_clk_get() and devm_request_irq()") from the tree and commit b0ee5605234a ("spi: Convert to devm_ioremap_resource()") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
prev parent reply other threads:[~2013-02-06 6:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 5:21 linux-next: manual merge of the driver-core tree with the spi tree Stephen Rothwell
2013-02-06 6:03 ` 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=20130206060344.GB3352@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=jg1.han@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thierry.reding@avionic-design$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox