lkml.org 
[lkml]   [2012]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the vfs tree with Linus' tree
On Tue, Feb 14, 2012 at 11:54:19AM +1100, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in
> drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging:
> pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit
> 044ff9e29029 ("switch open-coded instances of d_make_root() to new
> helper") from the vfs tree.
>
> The former just removes this file, so I did that.

*nod*

I'll rebase it to the current, then this one should go away...


\
 
 \ /
  Last update: 2012-02-14 02:45    [W:1.172 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site