summaryrefslogtreecommitdiff
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifsLinus Torvalds2017-05-136-8/+36
|\
| * ubifs: Fix a typo in comment of ioctl2ubifs & ubifs2ioctlRock Lee2017-05-081-3/+3
| * ubifs: Remove unnecessary assignmentStefan Agner2017-05-081-1/+0
| * ubifs: Fix cut and paste error on sb type comparisonsColin Ian King2017-05-081-2/+2
| * ubifs: Add CONFIG_UBIFS_FS_SECURITY to disable/enable security labelsHyunchul Lee2017-05-083-2/+31
* | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2017-05-133-66/+50
|\ \
| * | dax: fix PMD data corruption when fault races with writeRoss Zwisler2017-05-121-14/+14
| * | dax: fix data corruption when fault races with writeJan Kara2017-05-121-16/+16
| * | ext4: return to starting transaction in ext4_dax_huge_fault()Jan Kara2017-05-121-4/+17
| * | mm: fix data corruption due to stale mmap readsJan Kara2017-05-121-1/+1
| * | dax: prevent invalidation of mapped DAX entriesRoss Zwisler2017-05-121-29/+0
| * | Tigran has movedAndrew Morton2017-05-121-2/+2
* | | Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2017-05-126-68/+6
|\ \ \ | |/ / |/| |
| * | filesystem-dax: fix broken __dax_zero_page_range() conversionDan Williams2017-05-101-2/+2
| * | block, dax: move "select DAX" from BLOCK to FS_DAXDan Williams2017-05-085-66/+4
* | | Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2017-05-123-21/+54
|\ \ \
| * | | make sure that mntns_install() doesn't end up with referral for rootAl Viro2017-04-212-7/+49
| * | | path_init(): don't bother with checking MAY_EXEC for LOOKUP_ROOTAl Viro2017-04-211-8/+2
| * | | make sure that fchdir() won't accept referral points, etc.Al Viro2017-04-211-6/+3
* | | | Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtdLinus Torvalds2017-05-111-1/+1
|\ \ \ \
| * | | | jffs2: fix spelling mistake: "requestied" -> "requested"Colin Ian King2017-04-191-1/+1
* | | | | Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2017-05-101-1/+1
|\ \ \ \ \
| * | | | | Annotate hardware config module parameters in fs/pstore/David Howells2017-04-201-1/+1
* | | | | | Merge tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2017-05-109-60/+97
|\ \ \ \ \ \
| * | | | | | nfsd: Fix up the "supattr_exclcreat" attributesTrond Myklebust2017-05-101-3/+8
| * | | | | | nfsd: encoders mustn't use unitialized values in error casesJ. Bruce Fields2017-05-101-4/+4
| * | | | | | nfsd: fix undefined behavior in nfsd4_layout_verifyAri Kauppi2017-05-091-1/+2
| * | | | | | lockd: fix lockd shutdown raceJ. Bruce Fields2017-05-081-2/+4
| * | | | | | NFSv4: Fix callback server shutdownTrond Myklebust2017-04-271-8/+16
| * | | | | | NFSv4.x/callback: Create the callback service through svc_create_pooledKinglong Mee2017-04-271-1/+1
| * | | | | | lockd: remove redundant check on blockColin Ian King2017-04-251-9/+9
| * | | | | | NFS: don't try to cross a mountpount when there isn't one there.NeilBrown2017-04-251-4/+20
| * | | | | | nfsd4: remove pointless strdup_if_nonnullNeilBrown2017-04-251-19/+6
| * | | | | | nfsd: check for oversized NFSv2/v3 argumentsJ. Bruce Fields2017-04-252-9/+27
* | | | | | | Merge tag 'nfs-for-4.12-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2017-05-1039-2764/+618
|\ \ \ \ \ \ \
| * | | | | | | pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabledTrond Myklebust2017-05-091-0/+11
| * | | | | | | NFSv4.1: Work around a Linux server bug...Trond Myklebust2017-05-091-0/+6
| * | | | | | | NFS append COMMIT after synchronous COPYOlga Kornievskaia2017-05-084-39/+35
| * | | | | | | NFSv4: Fix exclusive create attributes encodingTrond Myklebust2017-05-081-40/+35
| * | | | | | | NFSv4: Fix an rcu lock leakTrond Myklebust2017-05-081-2/+4
| * | | | | | | nfs: use kmap/kunmap directlyFabian Frederick2017-05-051-55/+12
| * | | | | | | NFS: always treat the invocation of nfs_getattr as cache hit when noac is onHou Tao2017-05-051-1/+4
| * | | | | | | Fix nfs_client refcounting if kmalloc fails in nfs4_proc_exchange_id and nfs4...Dave Wysochanski2017-05-051-2/+6
| * | | | | | | NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSIONTrond Myklebust2017-05-052-4/+13
| * | | | | | | pNFS: Fix NULL dereference in pnfs_generic_alloc_ds_commitsFred Isaman2017-05-031-1/+1
| * | | | | | | pNFS: Fix a typo in pnfs_generic_alloc_ds_commitsTrond Myklebust2017-05-021-1/+1
| * | | | | | | pNFS: Fix a deadlock when coalescing writes and returning the layoutTrond Myklebust2017-05-021-2/+0
| * | | | | | | pNFS: Don't clear the layout return info if there are segments to returnTrond Myklebust2017-05-021-1/+7
| * | | | | | | pNFS: Ensure we commit the layout if it has been invalidatedTrond Myklebust2017-04-293-0/+5
| * | | | | | | pNFS: Don't send COMMITs to the DSes if the server invalidated our layoutTrond Myklebust2017-04-291-0/+7
View Lorry Controller Status