Merge drm-fixes-for-v4.17-rc6-urgent into drm-next

Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.

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

49 files changed, 230 insertions, 63 deletions

diff --git a/include/dt-bindings/clock/stm32mp1-clks.h b/include/dt-bindings/clock/stm32mp1-clks.h
index 86e3ec662ef4..90ec780bfc68 100644
--- a/include/dt-bindings/clock/stm32mp1-clks.h
+++ b/include/dt-bindings/clock/stm32mp1-clks.h
@@ -76,7 +76,7 @@
 #define I2C6            63
 #define USART1          64
 #define RTCAPB          65
-#define TZC             66
+#define TZC1            66
 #define TZPC            67
 #define IWDG1           68
 #define BSEC            69
@@ -123,6 +123,7 @@
 #define CRC1            110
 #define USBH            111
 #define ETHSTP          112
+#define TZC2            113
 
 /* Kernel clocks */
 #define SDMMC1_K        118
@@ -228,7 +229,6 @@
 #define CK_MCO2         212
 
 /* TRACE & DEBUG clocks */
-#define DBG             213
 #define CK_DBG          214
 #define CK_TRACE        215
 
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 24f03941ada8..e7efe12a81bd 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -131,6 +131,7 @@ struct vgic_irq {
                 u32 mpidr;                      /* GICv3 target VCPU */
         };
         u8 source;                      /* GICv2 SGIs only */
+        u8 active_source;               /* GICv2 SGIs only */
         u8 priority;
         enum vgic_irq_config config;    /* Level or edge */
 
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 486e65e3db26..469b20e1dd7e 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -31,6 +31,7 @@ struct bpf_map_ops {
         void (*map_release)(struct bpf_map *map, struct file *map_file);
         void (*map_free)(struct bpf_map *map);
         int (*map_get_next_key)(struct bpf_map *map, void *key, void *next_key);
+        void (*map_release_uref)(struct bpf_map *map);
 
         /* funcs callable from userspace and from eBPF programs */
         void *(*map_lookup_elem)(struct bpf_map *map, void *key);
@@ -351,6 +352,7 @@ int bpf_prog_array_copy(struct bpf_prog_array __rcu *old_array,
                 struct bpf_prog **_prog, *__prog;       \
                 struct bpf_prog_array *_array;          \
                 u32 _ret = 1;                           \
+                preempt_disable();                      \
                 rcu_read_lock();                        \
                 _array = rcu_dereference(array);        \
                 if (unlikely(check_non_null && !_array))\
@@ -362,6 +364,7 @@ int bpf_prog_array_copy(struct bpf_prog_array __rcu *old_array,
                 }                                       \
 _out:                                                   \
                 rcu_read_unlock();                      \
+                preempt_enable_no_resched();            \
                 _ret;                                   \
          })
 
@@ -434,7 +437,6 @@ int bpf_stackmap_copy(struct bpf_map *map, void *key, void *value);
 int bpf_fd_array_map_update_elem(struct bpf_map *map, struct file *map_file,
                                  void *key, void *value, u64 map_flags);
 int bpf_fd_array_map_lookup_elem(struct bpf_map *map, void *key, u32 *value);
-void bpf_fd_array_map_clear(struct bpf_map *map);
 int bpf_fd_htab_map_update_elem(struct bpf_map *map, struct file *map_file,
                                 void *key, void *value, u64 map_flags);
 int bpf_fd_htab_map_lookup_elem(struct bpf_map *map, void *key, u32 *value);
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index d3339dd48b1a..b324e01ccf2d 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -25,6 +25,7 @@
 #define PHY_ID_BCM54612E                0x03625e60
 #define PHY_ID_BCM54616S                0x03625d10
 #define PHY_ID_BCM57780                 0x03625d90
+#define PHY_ID_BCM89610                 0x03625cd0
 
 #define PHY_ID_BCM7250                  0xae025280
 #define PHY_ID_BCM7260                  0xae025190
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 528ccc943cee..96bb32285989 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -77,7 +77,10 @@ struct ceph_osd_data {
                         u32                     bio_length;
                 };
 #endif /* CONFIG_BLOCK */
-                struct ceph_bvec_iter   bvec_pos;
+                struct {
+                        struct ceph_bvec_iter   bvec_pos;
+                        u32                     num_bvecs;
+                };
         };
 };
 
@@ -412,6 +415,10 @@ void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,
                                     struct ceph_bio_iter *bio_pos,
                                     u32 bio_length);