Subject: linux-next: manual merge of the tip tree with the nfs tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Aug 2014 17:19:06 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in
fs/nfs/pagelist.c between commit e7029206ff43 ("nfs: check
wait_on_bit_lock err in page_group_lock") from the nfs tree and commit
743162013d40 ("sched: Remove proliferation of wait_on_bit() action
functions") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc fs/nfs/pagelist.c
index 9425118e91d7,0be5050638f7..000000000000
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@@ -158,14 -149,8 +152,13 @@@ nfs_page_group_lock(struct nfs_page *re
  
  	WARN_ON_ONCE(head != head->wb_head);
  
 -	wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
 +	do {
 +		ret = wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
- 			nfs_wait_bit_uninterruptible,
  			TASK_UNINTERRUPTIBLE);
 +	} while (wait && ret != 0);
 +
 +	WARN_ON_ONCE(ret > 0);
 +	return ret;
  }
  
  /*