From mboxrd@z Thu Jan 1 00:00:00 1970 From: Artem Bityutskiy Subject: Re: [PATCH 1/8] writeback: get rid of generic_sync_sb_inodes() export Date: Tue, 08 Sep 2009 14:01:38 +0300 Message-ID: <4AA63992.7040200@gmail.com> References: <1252401791-22463-1-git-send-email-jens.axboe@oracle.com> <1252401791-22463-2-git-send-email-jens.axboe@oracle.com> <4AA631AA.6000803@gmail.com> <20090908104111.GS18599@kernel.dk> <1252407150.5060.51.camel@localhost> <20090908105728.GU18599@kernel.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, chris.mason@oracle.com, david@fromorbit.com, hch@infradead.org, akpm@linux-foundation.org, jack@suse.cz To: Jens Axboe Return-path: Received: from smtp.nokia.com ([192.100.105.134]:30830 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754274AbZIHLCF (ORCPT ); Tue, 8 Sep 2009 07:02:05 -0400 In-Reply-To: <20090908105728.GU18599@kernel.dk> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On 09/08/2009 01:57 PM, Jens Axboe wrote: >> But well, if you do not want to carry my patch, then I'll have to >> re-base my tree later, fix stuff, and send a pull request. I mean, >> your stuff will for sure be merged first, because I send pull reques= ts >> late, just because UBIFS is a minor thing in the kernel. > > You don't have to rebase, if my work is merged first then you just me= rge > Linus' tree into yours and fixup the conflict before asking Linus to > pull. I thought Linus asked to avoid merge commits in pull requests at some point, no? So I thought that I'd re-base then, which Linus also dislikes :-) > It's a trivial conflict, I don't understand what the fuzz is about. Well, I was just thinking how to avoid merge commits. But I guess I can do what you suggest. --=20 Best Regards, Artem Bityutskiy (=D0=90=D1=80=D1=82=D1=91=D0=BC =D0=91=D0=B8=D1=82=D1=8E= =D1=86=D0=BA=D0=B8=D0=B9) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel= " in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html