diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-12-09 17:12:26 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-12-09 17:12:26 +0100 |
| commit | 2941b0e91ba68b1f77140e556307e00616a5bb46 (patch) | |
| tree | 01950b6ed12d06ebe4c39d1a2122050a9a570e93 /Makefile | |
| parent | nfsd: minor off by one checks in __write_versions() (diff) | |
| parent | sunrpc: add a debugfs rpc_xprt directory with an info file in it (diff) | |
| download | linux-2941b0e91ba68b1f77140e556307e00616a5bb46.tar.xz linux-2941b0e91ba68b1f77140e556307e00616a5bb46.zip | |
Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch
Mainly what I need is 860a0d9e511f "sunrpc: add some tracepoints in
svc_rqst handling functions", which subsequent server rpc patches from
jlayton depend on. I'm merging this later tag on the assumption that's
more likely to be a tested and stable point.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 18 SUBLEVEL = 0 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Diseased Newt # *DOCUMENTATION* |