Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755744Ab1CGLOm (ORCPT ); Mon, 7 Mar 2011 06:14:42 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:42578 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751895Ab1CGLOl (ORCPT ); Mon, 7 Mar 2011 06:14:41 -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=vcZpH7gq1+DJE+y7SgqbYd/ULJKbkzouLqkARjXEph6LcpdCJL3mmCIya5udQa64J0 DVIe/b6v6qXTAGxkxjjAUMIzwViD6wLzERmrtxBqx8Zch5fFOdV5NIuQeCee7v8HMiNS u1KXYYtJqrG/vhUy8XdPIBcMVTNnFbImV2LTQ= MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: <20110307104747.GH20499@htj.dyndns.org> References: <20110307131958.84a5d818.sfr@canb.auug.org.au> <20110307063618.GA10365@mtj.dyndns.org> <4D749A81.50809@kernel.dk> <20110307104747.GH20499@htj.dyndns.org> Date: Mon, 7 Mar 2011 12:14:39 +0100 Message-ID: Subject: Re: linux-next: manual merge of the block tree with Linus' tree From: Sedat Dilek To: Tejun Heo Cc: Jens Axboe , 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: 2102 Lines: 57 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. - Sedat - -- 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/