[linux] 01/01: [rt] Refresh one patch that had a textual conflict with 4.9.14

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 70bad880aca5a5d18f948b40d98e65e98ea33b88
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Mar 12 18:37:37 2017 +0000

    [rt] Refresh one patch that had a textual conflict with 4.9.14
---
 .../features/all/rt/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/features/all/rt/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch b/debian/patches/features/all/rt/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
index 4875666..7cfee74 100644
--- a/debian/patches/features/all/rt/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
+++ b/debian/patches/features/all/rt/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
@@ -31,7 +31,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
 
 --- a/fs/nfs/delegation.c
 +++ b/fs/nfs/delegation.c
-@@ -150,11 +150,11 @@ static int nfs_delegation_claim_opens(st
+@@ -150,11 +150,11 @@ again:
  		sp = state->owner;
  		/* Block nfs4_proc_unlck */
  		mutex_lock(&sp->so_delegreturn_mutex);
@@ -68,7 +68,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
  	ret = _nfs4_proc_open(opendata);
  	if (ret != 0)
 @@ -2736,7 +2736,7 @@ static int _nfs4_open_and_get_state(stru
- 	ctx->state = state;
+ 
  	if (d_inode(dentry) == state->inode) {
  		nfs_inode_attach_open_context(ctx);
 -		if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
@@ -101,7 +101,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
  restart:
  	list_for_each_entry(state, &sp->so_states, open_states) {
  		if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
-@@ -1567,14 +1571,20 @@ static int nfs4_reclaim_open_state(struc
+@@ -1567,14 +1571,20 @@ restart:
  		spin_lock(&sp->so_lock);
  		goto restart;
  	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git