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

diff --cc drivers/acpi/power.c
Simple merge

diff --cc drivers/acpi/sleep.c
index 1784cb30e7cf239444e17292fab365012aa9a46c,1cc02ca2af2a5c9243a639d4a0f3ea3aeb3424d3..028dd425702c0b83b73990093a10c323d6bb24c0
--- 1/drivers/acpi/sleep.c
--- 2/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 drivers/ata/libata-core.c
Simple merge

diff --cc drivers/ata/libata-eh.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc include/linux/libata.h
Simple merge

diff --cc include/scsi/scsi.h
Simple merge

diff --cc include/scsi/scsi_device.h
index aff7525de194611392e1ee61f536a25aa0a312bf,7539f52a33c9d5b30ee71f8d484a59a9f17b52fd..9895f69294fc4a65113f3368155f087e86d42807
--- 1/include/scsi/scsi_device.h
--- 2/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 */