Jens Axboe b28bc9b38c Merge tag 'v3.13-rc6' into for-3.14/core ...

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	block/blk-flush.c
	fs/btrfs/check-integrity.c
	fs/btrfs/extent_io.c
	fs/btrfs/scrub.c
	fs/logfs/dev_bdev.c

2013-12-31 09:51:02 -07:00

..

blocklayout

Merge tag 'v3.13-rc6' into for-3.14/core

2013-12-31 09:51:02 -07:00

objlayout

NFSv4.1 use pnfs_device maxcount for the objectlayout gdia_maxcount

2013-06-28 15:34:45 -04:00

cache_lib.c

NFS: simplify and clean cache library

2013-02-15 10:43:36 -05:00

cache_lib.h

NFS: simplify and clean cache library

2013-02-15 10:43:36 -05:00

callback_proc.c

NFS: When displaying session slot numbers, use "%u" consistently

2013-09-03 15:26:30 -04:00

callback_xdr.c

Merge branch 'labeled-nfs' into linux-next

2013-06-28 16:29:51 -04:00

callback.c

nfs: Use PTR_ERR_OR_ZERO in 'nfs41_callback_up' function

2013-10-28 18:16:55 -04:00

callback.h

NFS: Add in v4.2 callback operation

2013-06-08 16:20:18 -04:00

client.c

NFS: cache parsed auth_info in nfs_server

2013-10-28 15:37:43 -04:00

delegation.c

NFSv4: Add tracepoints for debugging delegations

2013-08-22 08:58:24 -04:00

delegation.h

NFSv4: Fix CB_RECALL_ANY to only return delegations that are not in use

2013-04-05 17:03:57 -04:00

dir.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-11-13 15:34:18 +09:00

direct.c

nfs: use %p[dD] instead of open-coded (and often racy) equivalents

2013-10-24 23:34:50 -04:00

dns_resolve.c

NFS: Enabling v4.2 should not recompile nfsd and lockd

2013-11-19 16:20:40 -05:00

dns_resolve.h

NFS: DNS resolver cache per network namespace context introduced

2012-01-31 18:20:26 -05:00

file.c

nfs: use %p[dD] instead of open-coded (and often racy) equivalents

2013-10-24 23:34:50 -04:00

fscache-index.c

NFS: Use the inode->i_version to cache NFSv4 change attribute information

2011-10-18 09:14:34 -07:00

fscache.c

NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()

2013-09-27 18:40:25 +01:00

fscache.h

NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()

2013-09-27 18:40:25 +01:00

getroot.c

NFS:Add labels to client function prototypes

2013-06-08 16:20:15 -04:00

idmap.c

NFSv4: Convert idmapper to use the new framework for pipefs dentries

2013-09-01 11:12:42 -04:00

inode.c

NFS: Fix a warning in nfs_setsecurity

2013-11-19 16:20:41 -05:00

internal.h

NFS: Enabling v4.2 should not recompile nfsd and lockd

2013-11-19 16:20:40 -05:00

iostat.h

NFS: Squelch compiler warning in nfs_add_server_stats()

2010-05-14 15:09:31 -04:00

Kconfig

nfs: fix pnfs Kconfig defaults

2013-11-15 13:41:43 -05:00

Makefile

NFS: Enable slot table helpers for NFSv4.0

2013-09-03 15:26:33 -04:00

mount_clnt.c

nfs: have nfs_mount fake up a auth_flavs list when the server didn't provide it

2013-06-28 15:51:51 -04:00

namespace.c

nfs: use %p[dD] instead of open-coded (and often racy) equivalents

2013-10-24 23:34:50 -04:00

netns.h

nfs: include NFSv4 header in netns.h

2012-10-02 08:17:02 -07:00

nfs2super.c

NFS: Convert v2 into a module

2012-07-30 19:06:41 -04:00

nfs2xdr.c

nfs: Convert nfs2xdr to use kuids and kgids

2013-02-13 06:15:30 -08:00

nfs3acl.c

userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr

2012-09-18 01:01:35 -07:00

nfs3client.c

NFS: Only initialize the ACL client in the v3 case

2012-07-30 19:05:54 -04:00

nfs3proc.c

nfs: use %p[dD] instead of open-coded (and often racy) equivalents

2013-10-24 23:34:50 -04:00

nfs3super.c

NFS: Convert v3 into a module

2012-07-30 19:06:46 -04:00

nfs3xdr.c

nfs: Convert nfs3xdr to use kuids and kgids

2013-02-13 06:15:31 -08:00

nfs4_fs.h

NFS: Enabling v4.2 should not recompile nfsd and lockd

2013-11-19 16:20:40 -05:00

nfs4client.c

NFS: add support for multiple sec= mount options

2013-10-28 15:38:02 -04:00

nfs4file.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-11-13 15:34:18 +09:00

nfs4filelayout.c

NFSv4.1 Use MDS auth flavor for data server connection

2013-09-06 14:49:16 -04:00

nfs4filelayout.h

NFSv4.1: Use layout credentials for get_deviceinfo calls

2013-06-06 16:24:37 -04:00

nfs4filelayoutdev.c

NFSv4.1: Ensure memory ordering between nfs4_ds_connect and nfs4_fl_prepare_ds

2013-09-29 15:58:35 -04:00

nfs4getroot.c

NFSv4: Fix security auto-negotiation

2013-09-07 16:18:30 -04:00

nfs4namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-11-13 15:34:18 +09:00

nfs4proc.c

Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2013-12-05 13:05:48 -08:00

nfs4renewd.c

workqueue: use mod_delayed_work() instead of cancel + queue

2012-08-13 16:27:37 -07:00

nfs4session.c

When CONFIG_NFS_V4_1 is not enabled, "make C=2" emits this warning:

2013-09-04 12:26:30 -04:00

nfs4session.h

When CONFIG_NFS_V4_1 is not enabled, "make C=2" emits this warning:

2013-09-04 12:26:30 -04:00

nfs4state.c

Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2013-11-16 13:14:56 -08:00

nfs4super.c

nfs: Use PTR_ERR_OR_ZERO in 'nfs/nfs4super.c'

2013-10-28 18:16:56 -04:00

nfs4sysctl.c

nfs: include nfs4_fh.h in nfs4sysctl.c

2012-10-02 08:17:03 -07:00

nfs4trace.c

NFSv4.1: Add tracepoints for debugging slot table operations

2013-08-22 08:58:27 -04:00

nfs4trace.h

NFSv4.1: Add tracepoints for debugging test_stateid events

2013-08-22 08:58:27 -04:00

nfs4xdr.c

NFSv4.2: encode_readdir - only ask for labels when doing readdirplus

2013-11-04 16:42:51 -05:00

nfs.h

NFS: Convert v4 into a module

2012-07-30 19:06:52 -04:00

nfsroot.c

SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG

2012-03-20 13:08:26 -04:00

nfstrace.c

NFS: Add event tracing for generic NFS lookups

2013-08-22 08:58:18 -04:00

nfstrace.h

NFS: Add tracepoints for debugging NFS hard links

2013-08-22 08:58:20 -04:00

pagelist.c

NFS: Don't check lock owner compatability unless file is locked (part 2)

2013-09-06 11:27:41 -04:00

pnfs_dev.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

pnfs.c

NFSv4: Add tracepoints for debugging reads and writes

2013-08-22 08:58:26 -04:00

pnfs.h

NFSv4.1 Fix gdia_maxcount calculation to fit in ca_maxresponsesize

2013-06-28 15:34:43 -04:00

proc.c

nfs: use %p[dD] instead of open-coded (and often racy) equivalents

2013-10-24 23:34:50 -04:00

read.c

NFSv4: Don't try to recover NFSv4 locks when they are lost.

2013-09-04 12:26:32 -04:00

super.c

NFS: correctly report misuse of "migration" mount option.

2013-11-15 13:41:43 -05:00

symlink.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sysctl.c

NFS: Initialize v4 sysctls from nfs_init_v4()

2012-07-17 13:33:18 -04:00

unlink.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-11-13 15:34:18 +09:00

write.c

nfs: use %p[dD] instead of open-coded (and often racy) equivalents

2013-10-24 23:34:50 -04:00