linux-next: manual merge of the block tree with the vfs tree

[Stephen Rothwell]

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
fs/fs-writeback.c between commit 1c9539ad0dd1c3c3964ea35d5a355a0ed19c39c7
("fs-writeback.c: bitfields should be unsigned") from the vfs tree and
commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: fix
WB_SYNC_NONE writeback from umount") from the block tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/fs-writeback.c
index 24e85ce,0f62957..0000000
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@@ -42,9 -42,10 +42,10 @@@ struct wb_writeback_args 
  	long nr_pages;
  	struct super_block *sb;
  	enum writeback_sync_modes sync_mode;
 -	int for_kupdate:1;
 -	int range_cyclic:1;
 -	int for_background:1;
 -	int sb_pinned:1;
 +	unsigned int for_kupdate:1;
 +	unsigned int range_cyclic:1;
 +	unsigned int for_background:1;
++	unsigned int sb_pinned:1;
  };
  
  /*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/