From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757985AbYEVKzM (ORCPT ); Thu, 22 May 2008 06:55:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751361AbYEVKy6 (ORCPT ); Thu, 22 May 2008 06:54:58 -0400 Received: from smtp.nokia.com ([192.100.122.230]:35091 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbYEVKy5 (ORCPT ); Thu, 22 May 2008 06:54:57 -0400 Message-ID: <483550C5.1010100@yandex.ru> Date: Thu, 22 May 2008 13:53:57 +0300 From: Artem Bityutskiy User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: Andrew Morton CC: LKML Subject: Re: [PATCH take 2 01/28] VFS: introduce writeback_inodes_sb() References: <1210070159-22794-1-git-send-email-Artem.Bityutskiy@nokia.com> <1210070159-22794-2-git-send-email-Artem.Bityutskiy@nokia.com> <20080507002345.831bc379.akpm@linux-foundation.org> <48218F21.4090304@yandex.ru> <20080507083835.6ba126e6.akpm@linux-foundation.org> <4832C7FF.2090904@yandex.ru> <20080520104907.e77ae05d.akpm@linux-foundation.org> In-Reply-To: <20080520104907.e77ae05d.akpm@linux-foundation.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-OriginalArrivalTime: 22 May 2008 10:53:59.0179 (UTC) FILETIME=[237ECDB0:01C8BBFA] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andrew Morton wrote: > Artem Bityutskiy 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 (Артём Битюцкий)