3 files changed, 34 insertions, 12 deletions

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index aa6f8571de13..5df4881dea7b 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -292,6 +292,9 @@ enum bpf_func_id {
 /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
 #define BPF_F_TUNINFO_IPV6              (1ULL << 0)
 
+/* BPF_FUNC_skb_set_tunnel_key flags. */
+#define BPF_F_ZERO_CSUM_TX              (1ULL << 1)
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 52f5834dcc41..df59edee25d1 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -98,10 +98,18 @@ struct media_device_info {
  * Connectors
  */
 /* It is a responsibility of the entity drivers to add connectors and links */
+#ifdef __KERNEL__
+        /*
+         * For now, it should not be used in userspace, as some
+         * definitions may change
+         */
+
 #define MEDIA_ENT_F_CONN_RF             (MEDIA_ENT_F_BASE + 0x30001)
 #define MEDIA_ENT_F_CONN_SVIDEO         (MEDIA_ENT_F_BASE + 0x30002)
 #define MEDIA_ENT_F_CONN_COMPOSITE      (MEDIA_ENT_F_BASE + 0x30003)
 
+#endif
+
 /*
  * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
  * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility
@@ -132,7 +140,7 @@ struct media_device_info {
 
 #define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE
 
-#ifndef __KERNEL__
+#if !defined(__KERNEL__) || defined(__NEED_MEDIA_LEGACY_API)
 
 /*
  * Legacy symbols used to avoid userspace compilation breakages
@@ -145,6 +153,10 @@ struct media_device_info {
 #define MEDIA_ENT_TYPE_MASK             0x00ff0000
 #define MEDIA_ENT_SUBTYPE_MASK          0x0000ffff
 
+/* End of the old subdev reserved numberspace */
+#define MEDIA_ENT_T_DEVNODE_UNKNOWN     (MEDIA_ENT_T_DEVNODE | \
+                                         MEDIA_ENT_SUBTYPE_MASK)
+
 #define MEDIA_ENT_T_DEVNODE             MEDIA_ENT_F_OLD_BASE
 #define MEDIA_ENT_T_DEVNODE_V4L         MEDIA_ENT_F_IO_V4L
 #define MEDIA_ENT_T_DEVNODE_FB          (MEDIA_ENT_T_DEVNODE + 2)
@@ -319,14 +331,14 @@ struct media_v2_entity {
         __u32 id;
         char name[64];          /* FIXME: move to a property? (RFC says so) */
         __u32 function;         /* Main function of the entity */
-        __u16 reserved[12];
-};
+        __u32 reserved[6];
+} __attribute__ ((packed));
 
 /* Should match the specific fields at media_intf_devnode */
 struct media_v2_intf_devnode {
         __u32 major;
         __u32 minor;
-};
+} __attribute__ ((packed));
 
 struct media_v2_interface {
         __u32 id;
@@ -338,22 +350,22 @@ struct media_v2_interface {
                 struct media_v2_intf_devnode devnode;
                 __u32 raw[16];
         };
-};
+} __attribute__ ((packed));
 
 struct media_v2_pad {
         __u32 id;
         __u32 entity_id;
         __u32 flags;
-        __u16 reserved[9];
-};
+        __u32 reserved[5];
+} __attribute__ ((packed));
 
 struct media_v2_link {
         __u32 id;
         __u32 source_id;
         __u32 sink_id;
         __u32 flags;
-        __u32 reserved[5];
-};
+        __u32 reserved[6];
+} __attribute__ ((packed));
 
 struct media_v2_topology {
         __u64 topology_version;
@@ -373,7 +385,7 @@ struct media_v2_topology {
         __u32 num_links;
         __u32 reserved4;
         __u64 ptr_links;
-};
+} __attribute__ ((packed));
 
 /* ioctls */
 
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 5b4a4be06e2b..cc68b92124d4 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -66,14 +66,18 @@ struct nd_cmd_ars_cap {
         __u64 length;
         __u32 status;
         __u32 max_ars_out;
+        __u32 clear_err_unit;
+        __u32 reserved;
 } __packed;
 
 struct nd_cmd_ars_start {
         __u64 address;
         __u64 length;
         __u16 type;
-        __u8 reserved[6];
+        __u8 flags;
+        __u8 reserved[5];
         __u32 status;
+        __u32 scrub_time;
 } __packed;
 
 struct nd_cmd_ars_status {
@@ -81,11 +85,14 @@ struct nd_cmd_ars_status {
         __u32 out_length;
         __u64 address;
         __u64 length;
+        __u64 restart_address;
+        __u64 restart_length;
         __u16 type;
+        __u16 flags;
         __u32 num_records;
         struct nd_ars_record {
                 __u32 handle;
-                __u32 flags;
+                __u32 reserved;
                 __u64 err_address;
                 __u64 length;
         } __packed records[0];