From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 25 Jul 2012 19:58:48 +0000 (-0400)
Subject: Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
X-Git-Tag: v3.6-rc1~102^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8407884dd9164ec18ed2afc00f56b87e36c51fcf;p=linux.git

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h
---

8407884dd9164ec18ed2afc00f56b87e36c51fcf
diff --cc drivers/acpi/sleep.c
index 1784cb30e7cf,1cc02ca2af2a..028dd425702c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@ -791,11 -796,19 +796,20 @@@ int acpi_pm_device_sleep_state(struct d
  		}
  	}
  
+ 	if (d_max_in < d_min)
+ 		return -EINVAL;
  	if (d_min_p)
  		*d_min_p = d_min;
+ 	/* constrain d_max with specified lowest limit (max number) */
+ 	if (d_max > d_max_in) {
+ 		for (d_max = d_max_in; d_max > d_min; d_max--) {
+ 			if (adev->power.states[d_max].flags.valid)
+ 				break;
+ 		}
+ 	}
  	return d_max;
  }
 +EXPORT_SYMBOL(acpi_pm_device_sleep_state);
  #endif /* CONFIG_PM */
  
  #ifdef CONFIG_PM_SLEEP
diff --cc include/scsi/scsi_device.h
index aff7525de194,7539f52a33c9..9895f69294fc
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@@ -153,7 -154,7 +154,8 @@@ 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 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 */