LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: sedat.dilek@gmail.com
Cc: Sedat Dilek <sedat.dilek@googlemail.com>,
	Tejun Heo <tj@kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the block tree with Linus' tree
Date: Mon, 07 Mar 2011 12:46:53 +0100	[thread overview]
Message-ID: <4D74C5AD.6020400@kernel.dk> (raw)
In-Reply-To: <AANLkTim=ftTzEX9arXjpPhs8XPbUCzZ2BJ3pOdxL+bNF@mail.gmail.com>

On 2011-03-07 12:35, Sedat Dilek wrote:
> On 3/7/11, Jens Axboe <axboe@kernel.dk> wrote:
>> On 2011-03-07 12:25, Sedat Dilek wrote:
>>> On 3/7/11, Jens Axboe <axboe@kernel.dk> wrote:
>>>> On 2011-03-07 12:14, Sedat Dilek wrote:
>>>>> On 3/7/11, Tejun Heo <tj@kernel.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@canb.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@canb.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"
>>
>> 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


  reply	other threads:[~2011-03-07 11:46 UTC|newest]

Thread overview: 103+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-07  2:19 Stephen Rothwell
2011-03-07  6:36 ` Tejun Heo
2011-03-07  8:42   ` Jens Axboe
2011-03-07 10:41     ` Sedat Dilek
2011-03-07 10:47       ` Tejun Heo
2011-03-07 11:14         ` Sedat Dilek
2011-03-07 11:16           ` Jens Axboe
2011-03-07 11:25             ` Sedat Dilek
2011-03-07 11:26               ` Jens Axboe
2011-03-07 11:35                 ` Sedat Dilek
2011-03-07 11:46                   ` Jens Axboe [this message]
2011-03-07 12:26                     ` Sedat Dilek
2011-03-07 11:42               ` Stephen Rothwell
2011-03-07 11:38             ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-11-25 23:38 Stephen Rothwell
2021-11-26  5:30 ` Christoph Hellwig
2021-11-01  1:36 Stephen Rothwell
2021-10-25  2:26 Stephen Rothwell
2021-08-17  5:25 Stephen Rothwell
2021-08-17 16:40 ` Tejun Heo
2021-08-17 16:50   ` Christoph Hellwig
2021-08-17 16:52     ` Tejun Heo
2021-08-09  4:29 Stephen Rothwell
2021-08-09 14:05 ` Jens Axboe
2020-12-14  3:56 Stephen Rothwell
2020-09-23  4:05 Stephen Rothwell
2020-01-28  0:38 Stephen Rothwell
2020-01-28  0:40 ` Jens Axboe
2019-04-15  3:06 Stephen Rothwell
2019-04-15 14:15 ` Jens Axboe
2019-04-15  3:00 Stephen Rothwell
2019-03-05  1:48 Stephen Rothwell
2018-11-16  2:19 Stephen Rothwell
2018-11-16  2:21 ` Jens Axboe
2017-09-04  3:09 Stephen Rothwell
2017-06-30  2:08 Stephen Rothwell
2017-06-26  2:44 Stephen Rothwell
2017-06-26  2:28 Stephen Rothwell
2017-06-23  3:06 Stephen Rothwell
2017-06-23  3:09 ` Jens Axboe
2017-06-23  3:24   ` Stephen Rothwell
2017-06-23  3:27     ` Jens Axboe
2017-06-23  3:33       ` Stephen Rothwell
2017-06-23  3:56         ` Jens Axboe
2017-06-23  3:29     ` Jens Axboe
2016-07-21  3:08 Stephen Rothwell
2016-07-08  3:07 Stephen Rothwell
2016-07-08  4:14 ` Stephen Rothwell
2016-07-08 14:11   ` Konrad Rzeszutek Wilk
2016-06-14  2:44 Stephen Rothwell
2016-05-03  4:25 Stephen Rothwell
2016-05-03 20:03 ` Jens Axboe
2016-03-07  3:12 Stephen Rothwell
2016-03-07  3:08 Stephen Rothwell
2016-03-01  0:25 Stephen Rothwell
2016-02-18  2:10 Stephen Rothwell
2016-01-13  2:07 Stephen Rothwell
2015-12-31  3:34 Stephen Rothwell
2016-01-21 22:46 ` Stephen Rothwell
2016-01-21 22:48   ` Jens Axboe
2015-12-14  1:36 Stephen Rothwell
2015-12-07  4:27 Stephen Rothwell
2015-12-07  4:16 Stephen Rothwell
2015-10-06  1:33 Stephen Rothwell
2015-08-27  2:36 Stephen Rothwell
2015-08-17  4:04 Stephen Rothwell
2015-06-04  4:51 Stephen Rothwell
2015-06-04  4:36 Stephen Rothwell
2015-06-03  3:33 Stephen Rothwell
2015-06-03  3:28 Stephen Rothwell
2015-06-01  4:56 Stephen Rothwell
2015-06-01 14:31 ` Mike Snitzer
2015-04-13  4:58 Stephen Rothwell
2015-01-27  4:03 Stephen Rothwell
2014-03-17  3:55 Stephen Rothwell
2014-03-10 15:39 Mark Brown
2013-11-01  3:25 Stephen Rothwell
2013-09-25  3:11 Stephen Rothwell
2013-05-01  5:17 Stephen Rothwell
2013-03-26  2:05 Stephen Rothwell
2012-12-07  2:44 Stephen Rothwell
2012-10-31  2:04 Stephen Rothwell
2012-10-31 13:55 ` Ben Hutchings
2012-10-31 13:57   ` Jens Axboe
2012-11-01 10:04   ` Herton Ronaldo Krzesinski
2011-11-01  5:15 Stephen Rothwell
2011-11-01  8:09 ` Jens Axboe
2011-11-01  9:03   ` Stephen Rothwell
2011-05-19  1:34 Stephen Rothwell
2011-03-21  0:43 Stephen Rothwell
2011-03-21  9:48 ` Jens Axboe
2010-09-16  2:04 Stephen Rothwell
2010-04-29  3:52 Stephen Rothwell
2010-04-29  7:33 ` Jens Axboe
2010-03-17  1:52 Stephen Rothwell
2010-03-17  2:03 ` Li Zefan
2010-02-25  3:10 Stephen Rothwell
2010-02-25  7:47 ` Jens Axboe
2010-02-25 23:11   ` Stephen Rothwell
2009-06-25  3:15 Stephen Rothwell
2009-06-25  3:30 ` Stephen Rothwell
2009-06-25  6:38   ` Jens Axboe
2009-06-25  7:42     ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D74C5AD.6020400@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sedat.dilek@gmail.com \
    --cc=sedat.dilek@googlemail.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tj@kernel.org \
    --subject='Re: linux-next: manual merge of the block tree with Linus'\'' tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).