From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>,
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 09:13:44 +0200 [thread overview]
Message-ID: <20100824091344.3945ccdc@mschwide.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20100824105328.9bf22335.sfr@canb.auug.org.au>
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.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
next prev parent reply other threads:[~2010-08-24 7:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 0:53 Stephen Rothwell
2010-08-24 7:13 ` Martin Schwidefsky [this message]
2010-08-24 8:17 ` Jens Axboe
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=20100824091344.3945ccdc@mschwide.boeblingen.de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®