diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /include/linux/sunrpc/xprt.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'include/linux/sunrpc/xprt.h')
| -rw-r--r-- | include/linux/sunrpc/xprt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 5e3e1b63dbb3..a16070dd03ee 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h | |||
| @@ -218,7 +218,8 @@ struct rpc_xprt { | |||
| 218 | struct work_struct task_cleanup; | 218 | struct work_struct task_cleanup; |
| 219 | struct timer_list timer; | 219 | struct timer_list timer; |
| 220 | unsigned long last_used, | 220 | unsigned long last_used, |
| 221 | idle_timeout; | 221 | idle_timeout, |
| 222 | max_reconnect_timeout; | ||
| 222 | 223 | ||
| 223 | /* | 224 | /* |
| 224 | * Send stuff | 225 | * Send stuff |