Merge branch 'linus' into stackprotector

Conflicts:
	arch/x86/include/asm/pda.h
	kernel/fork.c

1 files changed, 6 insertions, 4 deletions

diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index 7e375111d00..f38b9c586af 100644
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -5,8 +5,8 @@
 
 struct dev_info {
         mdk_rdev_t      *rdev;
-        sector_t        size;
-        sector_t        offset;
+        sector_t        num_sectors;
+        sector_t        start_sector;
 };
 
 typedef struct dev_info dev_info_t;
@@ -15,9 +15,11 @@ struct linear_private_data
 {
         struct linear_private_data *prev;       /* earlier version */
         dev_info_t              **hash_table;
-        sector_t                hash_spacing;
+        sector_t                spacing;
         sector_t                array_sectors;
-        int                     preshift; /* shift before dividing by hash_spacing */
+        int                     sector_shift;   /* shift before dividing
+                                                 * by spacing
+                                                 */
         dev_info_t              disks[0];
 };