Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753494Ab1CGM03 (ORCPT ); Mon, 7 Mar 2011 07:26:29 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:57268 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987Ab1CGM0Y (ORCPT ); Mon, 7 Mar 2011 07:26:24 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; b=JIgwB7Ilp2EdPo1yX53b5ePHgm7Lw7HcMV+iiDDYtR0DlkdQMIicD8Yjzo35hi6wVI c6gZ91TRSA7qLuvlxdMxYMeq73zf0/esyogdVRrAoKKrg4p3U6gJg+sSJjQdfGQe16bX zYfxxdbVCSRwMUxMiWKOoDT2jKyQr4aOjGf0E= MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: <4D74C5AD.6020400@kernel.dk> References: <20110307131958.84a5d818.sfr@canb.auug.org.au> <20110307063618.GA10365@mtj.dyndns.org> <4D749A81.50809@kernel.dk> <20110307104747.GH20499@htj.dyndns.org> <4D74BE7C.4050701@kernel.dk> <4D74C101.1030204@kernel.dk> <4D74C5AD.6020400@kernel.dk> Date: Mon, 7 Mar 2011 13:26:23 +0100 Message-ID: Subject: Re: linux-next: manual merge of the block tree with Linus' tree From: Sedat Dilek To: Jens Axboe Cc: Tejun Heo , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4520 Lines: 120 Thanks, I will wait till tommorrow with a new build of linux-next (looks like this is one of this "manic mondays" and... more coffee). Just looked in the meantime trough WildWildWeb and found a new tig-0.17 which I could built successfully against ncurses-5.8 and this was more important. - Sedat - On 3/7/11, Jens Axboe wrote: > On 2011-03-07 12:35, Sedat Dilek wrote: >> On 3/7/11, Jens Axboe wrote: >>> On 2011-03-07 12:25, Sedat Dilek wrote: >>>> On 3/7/11, Jens Axboe wrote: >>>>> On 2011-03-07 12:14, Sedat Dilek wrote: >>>>>> On 3/7/11, Tejun Heo wrote: >>>>>>> On Mon, Mar 07, 2011 at 11:41:23AM +0100, Sedat Dilek wrote: >>>>>>>> $ git log -1 | cat >>>>>>>> commit c45165cd2c77843f24ca18af54044303dc2a81ab >>>>>>>> Author: Stephen Rothwell >>>>>>>> Date: Mon Mar 7 17:38:41 2011 +1100 >>>>>>>> >>>>>>>> Add linux-next specific files for 20110307 >>>>>>>> >>>>>>>> Signed-off-by: Stephen Rothwell >>>>>>>> >>>>>>>> $ git pull >>>>>>>> git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git >>>>>>>> for-next >>>>>>>> remote: Counting objects: 158, done. >>>>>>>> remote: Compressing objects: 100% (89/89), done. >>>>>>>> remote: Total 106 (delta 87), reused 21 (delta 17) >>>>>>>> Receiving objects: 100% (106/106), 23.33 KiB, done. >>>>>>>> Resolving deltas: 100% (87/87), completed with 34 local objects. >>>>>>>> From >>>>>>>> git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block >>>>>>>> * branch for-next -> FETCH_HEAD >>>>>>>> warning: too many files (created: 1120 deleted: 637), skipping >>>>>>>> inexact >>>>>>>> rename detection >>>>>>>> warning: too many files (created: 974 deleted: 462), skipping >>>>>>>> inexact >>>>>>>> rename detection >>>>>>>> Auto-merging block/blk-core.c >>>>>>>> Auto-merging block/blk-flush.c >>>>>>>> CONFLICT (content): Merge conflict in block/blk-flush.c >>>>>>>> Auto-merging block/cfq-iosched.c >>>>>>>> CONFLICT (content): Merge conflict in block/cfq-iosched.c >>>>>>>> Automatic merge failed; fix conflicts and then commit the result. >>>>>>> >>>>>>> Ummm... don't those conflicts come from Stephen's commits? You would >>>>>>> need to revert the merge and fixup commits and then pull in the block >>>>>>> branch. >>>>>>> >>>>>>> Thanks. >>>>>>> >>>>>>> -- >>>>>>> tejun >>>>>>> >>>>>> >>>>>> I have reverted the merge-fix from Stephen "[PATCH] block: update for >>>>>> __blk_run_queue() API update" which changed block/blk-flush.c, this >>>>>> remains: >>>>>> ... >>>>>> CONFLICT (content): Merge conflict in block/cfq-iosched.c >>>>>> >>>>>> As it is 12p.m. and sun shining, my decision and direction is clear: >>>>>> Lunch + City. >>>>> >>>>> Just checked here, I can pull my for-next cleanly into Linus' master. >>>>> What is the block tree for-next branch sha? >>>>> >>>>> -- >>>>> Jens Axboe >>>>> >>>>> >>>> >>>> No, I tried to merge your for-next into linux-next (which will happen >>>> with tomorrows linux-next). >>>> >>>> [ linux-2.6-block.git#for-next ] >>>> commit b873c5d692d4d5453cceed18bb06c62bb1a73ac0 >>>> "Merge branch 'block-for-2.6.39-core' of >>>> ssh:///linux/kernel/git/tj/misc into for-2.6.39/core" >>> >>> linux-next should not have any CFQ changes that don't come from for-next >>> from the linux block tree. Are you pulling it into a linux-next that >>> already have some of the block changes? >>> >>> -- >>> Jens Axboe >>> >>> >> >> I have reverted the manual merge-fix from Stephen as pointed out by Tejun. >> >> As tig (utility) is broken with ncurses-5.8 in Debian/sid I currently >> can't look through the commits. >> So, I can't say if there were further modifications by merging block >> stuff into linux-next. >> I have added the last 5 commits to block/cfq-iosched.c as TXT. > > OK, I see Stephen already pointed out where things have gone wrong. I > try to ensure that it'll merge into Linus' git cleanly, so I know that > Stephen wont run into problems. Sometimes things will get fast tracked > into Linus' git and I don't update for-next in time, that's when > problems arise. > > linux-next is a new tree everyday, you can't pull from it like you would > other development trees. > > -- > Jens Axboe > > -- 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/