Merge branch 'for-4.11/libnvdimm' into for-4.12/dax

2 files changed, 1 insertions, 28 deletions

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index db4c253f8011..dcfc3a5a9cb1 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -713,33 +713,6 @@ enum btrfs_err_code {
         BTRFS_ERROR_DEV_ONLY_WRITABLE,
         BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
 };
-/* An error code to error string mapping for the kernel
-*  error codes
-*/
-static inline char *btrfs_err_str(enum btrfs_err_code err_code)
-{
-        switch (err_code) {
-                case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
-                        return "unable to go below two devices on raid1";
-                case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
-                        return "unable to go below four devices on raid10";
-                case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
-                        return "unable to go below two devices on raid5";
-                case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
-                        return "unable to go below three devices on raid6";
-                case BTRFS_ERROR_DEV_TGT_REPLACE:
-                        return "unable to remove the dev_replace target dev";
-                case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
-                        return "no missing devices found to remove";
-                case BTRFS_ERROR_DEV_ONLY_WRITABLE:
-                        return "unable to remove the only writeable device";
-                case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
-                        return "add/delete/balance/replace/resize operation "\
-                                "in progress";
-                default:
-                        return NULL;
-        }
-}
 
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
                                    struct btrfs_ioctl_vol_args)
diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h
index d08c63f3dd6f..0c5d5dd61b6a 100644
--- a/include/uapi/linux/packet_diag.h
+++ b/include/uapi/linux/packet_diag.h
@@ -64,7 +64,7 @@ struct packet_diag_mclist {
         __u32   pdmc_count;
         __u16   pdmc_type;
         __u16   pdmc_alen;
-        __u8    pdmc_addr[MAX_ADDR_LEN];
+        __u8    pdmc_addr[32]; /* MAX_ADDR_LEN */
 };
 
 struct packet_diag_ring {