lkml.org 
[lkml]   [2009]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the osd tree with the scsi tree
Hi Boaz,

Today's linux-next merge of the osd tree got a conflict in
drivers/scsi/osd/osd_uld.c between commit
f89b9ee4a722721ed205b8c29555ac75fbe8c2cc ("[SCSI] osduld: Use
device->release instead of internal kref") from the scsi tree and commit
9b579fe8588b861dcf0c9b620757729643db4557 ("osduld: Use device->release
instead of internal kref") from the osd tree.

These are slightly different versions of the same patch ...

And commit 01e4c32c668251e74eb179ee1207c075466c4ef8 ("osduld: No need to
use dev_set_drvdata on embedded devices") from the osd also contributes
to the conflict.

I fixed it up (the obvious way) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-11-27 04:35    [W:0.163 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site