lkml.org 
[lkml]   [2013]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the driver-core tree with the mmc tree
On Mon, Oct 28, 2013 at 10:20:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mmc/host/mvsdio.c between commit 50596285e0be ("mmc: mvsdio:
> Remove redundant suspend and resume callbacks") from the mmc tree and
> commit 1867adee6ed7 ("mmc: mvsdio: fix deferred probe from __init") 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


\
 
 \ /
  Last update: 2013-10-31 23:41    [W:0.034 / U:0.340 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site