Re: linux-next: manual merge of the trivial tree with the vfs tree

[Jiri Kosina]

On Tue, 10 Aug 2010, Boaz Harrosh wrote:

> > Today's linux-next merge of the trivial tree got a conflict in
> > fs/exofs/inode.c between commit 21883a7d05d4c1e97943fa1a587aa2c2a3b09e8c
> > ("exofs: New truncate sequence") from the vfs tree and commit
> > 426d31071ac476ea62c62656b242930c17b58c00 ("fix printk typo 'faild'") from
> > the trivial tree.
> > 
> > Just context changes.  I fixed it up (see below) and can carry it for a
> > while.
> 
> The "exofs: New truncate sequence" is now in the Kernel. So perhaps
> fix printk typo 'faild'" could be rebased.
> 
> Or you can send the patch to me and I'll push it. Which ever you
> prefer

Thanks for notification, I have pulled Linus' branch now into 'for-next', 
so the conflict for linux-next should be gone.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/