Messages in this thread | | | Date | Tue, 5 Feb 2013 22:03:44 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the spi tree |
| |
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
| |