Subject: Re: linux-next: manual merge of the vfs tree with Linus' tree

From: Al Viro <[email-masked]>
Date: Mon, 4 May 2009 04:55:30 +0100

On Mon, May 04, 2009 at 01:13:03PM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next merge of the vfs tree got a conflict in
> fs/autofs4/expire.c between commit
> a8985f3ac503b51c5abf8883fc4fb912e13b955c ("autofs4: fix incorrect return
> in autofs4_mount_busy()") from Linus' tree and commit
> 552b170bd50157881fc65d1a58ec73b225a2e9bf ("switch follow_down()") from
> the vfs tree.

If you want rediffed, see #untested in the same repository.