lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the block tree with Linus' tree
On 2011-03-21 01:43, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in fs/super.c
> between commit 9d412a43c3b2 ("vfs: split off vfsmount-related parts of
> vfs_kern_mount()") from Linus' tree and commit 95f28604a65b ("fs: assign
> sb->s_bdi to default_backing_dev_info if the bdi is going away") from the
> block tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Thanks Stephen, your fixup is (obviously) correct.

--
Jens Axboe



\
 
 \ /
  Last update: 2011-03-21 10:51    [W:0.300 / U:0.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site