Messages in this thread | | | Date | Thu, 22 May 2008 13:53:57 +0300 | From | Artem Bityutskiy <> | Subject | Re: [PATCH take 2 01/28] VFS: introduce writeback_inodes_sb() |
| |
Andrew Morton wrote: > Artem Bityutskiy <dedekind@yandex.ru> wrote: >> 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.
OK. The thing is that we'd like to have UBI patches in UBIFS tree to give them a test. So what I've done I've created a branch named "for_andrew". Could you please switch your scripts from "master" branch to "for_andrew" branch? This branch will have the same but UBI patches which are already in the UBI tree and would cause conflicts.
Thanks.
-- Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |