Re: [PATCH take 2 01/28] VFS: introduce writeback_inodes_sb()

[Andrew Morton]

On Tue, 20 May 2008 15:45:51 +0300 Artem Bityutskiy <dedekind@xxxxxxxxx> wrote:

> Andrew,
> 
> Andrew Morton wrote:
> > I already added gti-ubifs.patch to the -mm lineup.  I haven't yet tried
> > pulling, merging or compiling it.
> 
> is it OK for you if ubifs-2.6.git will have some patches which ubi-2.6.git
> also contains. Will your -mm system handle this?

It happens occasionally and I usually manage to work it out.  Sometimes
with git hackery, sometimes manually.  It'd be better if it was a
once-off thing, rather than having new conflicts arise each time I
repull the trees, if possible.

--
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/