Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 6b08cc106c21..8dad4a307bb8 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -231,8 +231,7 @@ enum {
         ATA_FLAG_SW_ACTIVITY    = (1 << 22), /* driver supports sw activity
                                               * led */
         ATA_FLAG_NO_DIPM        = (1 << 23), /* host not happy with DIPM */
-        ATA_FLAG_LOWTAG         = (1 << 24), /* host wants lowest available tag */
-        ATA_FLAG_SAS_HOST       = (1 << 25), /* SAS host */
+        ATA_FLAG_SAS_HOST       = (1 << 24), /* SAS host */
 
         /* bits 24:31 of ap->flags are reserved for LLD specific flags */