diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-02-23 15:15:41 -0800 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-02-23 15:15:41 -0800 |
commit | 338c46403f169dd76bff8ed58fd0be0d600e7aba (patch) | |
tree | 20f2d03015bfb992428c661464be8c22018347fd /fs/nfsd | |
parent | ad7c946b35ad455417fdd4bc0e17deda4011841b (diff) | |
parent | 6308f3477510e15391ac82deaee66f8425339014 (diff) | |
parent | 85ba6bfe8bb2a4d907f7380a8f37b31616ad694e (diff) | |
download | linux-338c46403f169dd76bff8ed58fd0be0d600e7aba.tar.bz2 |
Merge branches 'fixes.2018.02.23a', 'srcu.2018.02.20a' and 'torture.2018.02.20a' into HEAD
fixes.2018.02.23a: Miscellaneous fixes
srcu.2018.02.20a: SRCU updates
torture.2018.02.20a: Torture-test updates