From: Jens Axboe <axboe@kernel.dk>
To: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Oberparleiter <peter.oberparleiter@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: linux-next: manual merge of the block tree with the s390 tree
Date: Tue, 24 Aug 2010 10:17:59 +0200 [thread overview]
Message-ID: <4C738037.20201@kernel.dk> (raw)
In-Reply-To: <20100824091344.3945ccdc@mschwide.boeblingen.de.ibm.com>
On 2010-08-24 09:13, Martin Schwidefsky wrote:
> Hi Stephen,
>
> On Tue, 24 Aug 2010 10:53:28 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi Jens,
>>
>> Today's linux-next merge of the block tree got a conflict in
>> drivers/s390/char/tape_block.c between commit
>> 7dc74a8fdb22f4410a2d8e45353c9ea75821a9ba ("[S390] tape: fix kernel panic
>> when setting tape device offline") from the s390 tree and commit
>> 52cc2eef31587b22ce9fbe77b064a031a9613ab0 ("block: switch s390 tape_block
>> and mg_disk to elevator_change()") from the block tree.
>>
>> I assume that the latter removes the need for the former, so I used that.
>
> The patch in the block tree includes the fix for the s390 tape driver.
> So I guess its best if I remove the s390 specific patch from the
> git390 tree.
>
Probably best, since the change in my tree is different from the
one you likely merged. So it will clash, as Stephen also reports.
--
Jens Axboe
next prev parent reply other threads:[~2010-08-24 8:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 0:53 linux-next: manual merge of the block tree with the s390 tree Stephen Rothwell
2010-08-24 7:13 ` Martin Schwidefsky
2010-08-24 8:17 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-13 3:06 Stephen Rothwell
2017-06-13 6:20 ` Christoph Hellwig
2017-06-13 6:28 ` Stephen Rothwell
2017-06-13 11:20 ` Sebastian Ott
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=4C738037.20201@kernel.dk \
--to=axboe@kernel.dk \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.oberparleiter@de.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.