Bug#607416: Device table incorrect for drivers/s390/block/dasd_eckd.c: 3880/3390 should be 3880/3380

[Jonathan Nieder <jrnieder@gmail.com>]

Hi Stephen,

Stephen Powell wrote:

>    commit f85cca6b25971a09efbe4c6a3ae405d40c8f86da
>    Merge: 6f576d5 dd30ac3
>    Author: Linus Torvalds <torvalds@linux-foundation.org>
>    Date:   Mon Feb 21 14:55:49 2011 -0800
> 
>        Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
> 
>        * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
>          [S390] net: provide architecture specific NET_SKB_PAD
>          [S390] atomic: use inline asm
>          [S390] correct ipl parameter block safe guard
>          [S390] atomic: use ACCESS_ONCE() for atomic_read()
>          [S390] dasd: correct device table
>
> -----
>
> As far as I can tell, only the last line is applicable to this bug.
>
>          [S390] dasd: correct device table

If you run "git log dd30ac3 --grep='dasd: correct device table'", then
the fix will show up:

 commit 5da24b7627ff821e154a3aaecd5d60e1d8e228a5
 Author: Stefan Haberland <stefan.haberland@de.ibm.com>
 Date:   Thu Feb 17 13:13:55 2011 +0100

     [S390] dasd: correct device table

     The 3880 storage control unit supports a 3380 device
     type, but not a 3390 device type.

     Reported-by: Stephen Powell <zlinuxman@wowway.com>
     Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
     Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

See http://www.kernel.org/pub/software/scm/git/docs/git-merge.html for
details if curious.

> Do I ask stable@kernel.org to port the whole commit?
> (It may have dependencies on previous commits and get complicated rather
> quickly.)  Or do I ask them to cherry pick that one-line change in
> drivers/s390/block/dasd_eckd.c?  I could use some advice here.

Presumably that (5da24b76) is the commit to backport; I am not sure
which kernels it applies to.

Hope that helps,
Jonathan