linux-kernel - Re: linux-next: manual merge of the block tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTi=9AUSv0rJtudgnEBERaCLpyHhVmcUY9mZUa8H-@mail.gmail.com>
Date:	Mon, 7 Mar 2011 12:25:23 +0100
From:	Sedat Dilek <sedat.dilek@...glemail.com>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	Tejun Heo <tj@...nel.org>, Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

On 3/7/11, Jens Axboe <axboe@...nel.dk> wrote:
> On 2011-03-07 12:14, Sedat Dilek wrote:
>> On 3/7/11, Tejun Heo <tj@...nel.org> wrote:
>>> On Mon, Mar 07, 2011 at 11:41:23AM +0100, Sedat Dilek wrote:
>>>> $ git log -1 | cat
>>>> commit c45165cd2c77843f24ca18af54044303dc2a81ab
>>>> Author: Stephen Rothwell <sfr@...b.auug.org.au>
>>>> Date:   Mon Mar 7 17:38:41 2011 +1100
>>>>
>>>>     Add linux-next specific files for 20110307
>>>>
>>>>     Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
>>>>
>>>> $ 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"

- Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/