2010-08-24 00:53:40

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the block tree with the s390 tree

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.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (562.00 B)
 (No filename) (490.00 B)
 Download all attachments

2010-08-24 07:13:50

by Martin Schwidefsky

[permalink] [raw]
Subject: Re: linux-next: manual merge of the block tree with the s390 tree

Hi Stephen,

On Tue, 24 Aug 2010 10:53:28 +1000
Stephen Rothwell <[email protected]> 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.

2010-08-24 08:17:48

by Jens Axboe

[permalink] [raw]
Subject: Re: linux-next: manual merge of the block tree with the s390 tree

On 2010-08-24 09:13, Martin Schwidefsky wrote:
> Hi Stephen,
>
> On Tue, 24 Aug 2010 10:53:28 +1000
> Stephen Rothwell <[email protected]> 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