Messages in this thread | | | Date | Fri, 17 Dec 2010 12:28:31 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the block tree with the tree |
| |
Hi Jens,
Today's linux-next merge of the block tree got a conflict in drivers/scsi/sd.c between commit e765221e4b44b2141704a0ab201632446235712b ("[SCSI] sd: improve logic and efficiecy of media-change detection") from the tree and commit c8d2e937355d02db3055c2fc203e5f017297ee1f ("sd: implement sd_check_events()") from the block tree.
The changes here are a bit extensive for me to figure out, so I used the block tree version of the conflicting code (there are other changes in the scsi tree as well). I probably needs checking. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |