lkml.org 
[lkml]   [2012]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the scsi tree with the libata tree
Hi James,

Today's linux-next merge of the scsi tree got a conflict in
include/scsi/scsi_device.h between commits 166a2967b45e ("libata: tell
scsi layer device supports runtime power off") and a4120295a40a ("sr:
support zero power ODD") from the libata tree and commit 2516034c2270
("[SCSI] set to WCE if usb cache quirk is present") from the scsi tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/scsi/scsi_device.h
index cfd951b,7539f52..0000000
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@@ -153,8 -154,7 +154,9 @@@ struct scsi_device
unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */
unsigned try_rc_10_first:1; /* Try READ_CAPACACITY_10 first */
unsigned is_visible:1; /* is the device visible in sysfs */
+ unsigned can_power_off:1; /* Device supports runtime power off */
+ unsigned wakeup_by_user:1; /* user wakes up the ODD */
+ unsigned wce_default_on:1; /* Cache is ON by default */

DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
struct list_head event_list; /* asserted events */
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-07-12 04:41    [W:0.027 / U:1.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site