Merge branch 'linus' into stackprotector

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

1 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 12b15c561a1..e585657e983 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -63,7 +63,15 @@ struct writeback_control {
         unsigned for_writepages:1;      /* This is a writepages() call */
         unsigned range_cyclic:1;        /* range_start is cyclic */
         unsigned more_io:1;             /* more io to be dispatched */
-        unsigned range_cont:1;
+        /*
+         * write_cache_pages() won't update wbc->nr_to_write and
+         * mapping->writeback_index if no_nrwrite_index_update
+         * is set.  write_cache_pages() may write more than we
+         * requested and we want to make sure nr_to_write and
+         * writeback_index are updated in a consistent manner
+         * so we use a single control to update them
+         */
+        unsigned no_nrwrite_index_update:1;
 };
 
 /*