summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'md/3.20' of git://neil.brown.name/mdLinus Torvalds2015-02-1218-608/+867
|\
| * md/raid10: fix conversion from RAID0 to RAID10NeilBrown2015-02-121-3/+9
| * md: wakeup thread upon rdev_dec_pending()Hannes Reinecke2015-02-051-7/+10
| * md: make reconfig_mutex optional for writes to md sysfs files.NeilBrown2015-02-052-164/+316
| * md: move mddev_lock and related to md.hNeilBrown2015-02-052-24/+26
| * md: use mddev->lock to protect updates to resync_{min,max}.NeilBrown2015-02-052-13/+47
| * md: minor cleanup in safe_delay_store.NeilBrown2015-02-051-5/+7
| * md: move GET_BITMAP_FILE ioctl out from mddev_lock.NeilBrown2015-02-052-26/+33
| * md: tidy up set_bitmap_fileNeilBrown2015-02-051-7/+9
| * md: remove unnecessary 'buf' from get_bitmap_file.NeilBrown2015-02-051-8/+4
| * md: remove mddev_lock from rdev_attr_show()NeilBrown2015-02-051-22/+14
| * md: remove mddev_lock() from md_attr_show()NeilBrown2015-02-052-16/+20
| * md/raid5: use ->lock to protect accessing raid5 sysfs attributes.NeilBrown2015-02-051-16/+28
| * md: remove need for mddev_lock() in md_seq_show()NeilBrown2015-02-051-5/+3
| * md/bitmap: protect clearing of ->bitmap by mddev->lockNeilBrown2015-02-052-0/+3
| * md: protect ->pers changes with mddev->lockNeilBrown2015-02-032-21/+35
| * md: level_store: group all important changes into one place.NeilBrown2015-02-031-30/+32
| * md: rename ->stop to ->freeNeilBrown2015-02-039-50/+35
| * md: split detach operation out from ->stop.NeilBrown2015-02-037-32/+29
| * md/linear: remove rcu protections in favour of suspend/resumeNeilBrown2015-02-031-30/+14
| * md: make merge_bvec_fn more robust in face of personality changes.NeilBrown2015-02-037-20/+42
| * md: make ->congested robust against personality changes.NeilBrown2015-02-0312-77/+38
| * md: rename mddev->write_lock to mddev->lockNeilBrown2015-02-032-19/+25
| * md/raid5: need_this_block: tidy/fix last condition.NeilBrown2015-02-031-10/+32
| * md/raid5: need_this_block: start simplifying the last two conditions.NeilBrown2015-02-031-5/+23
| * md/raid5: separate out the easy conditions in need_this_block.NeilBrown2015-02-031-9/+29
| * md/raid5: separate large if clause out of fetch_block().NeilBrown2015-02-031-4/+15
| * md: do_release_stripe(): No need to call md_wakeup_thread() twiceJes Sorensen2015-02-031-5/+2
| * x86/raid6: correctly check for assembler capabilitiesJan Beulich2015-02-034-2/+9
* | Merge tag 'jfs-3.20' of git://github.com/kleikamp/linux-shaggyLinus Torvalds2015-02-125-91/+45
|\ \
| * | jfs: Deletion of an unnecessary check before the function call "unload_nls"Markus Elfring2015-02-021-2/+1
| * | jfs: get rid of homegrown endianness helpersAl Viro2014-12-244-89/+44
* | | Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2015-02-1240-254/+2562
|\ \ \
| * | | nfsd: default NFSv4.2 to onJ. Bruce Fields2015-02-091-0/+1
| * | | nfsd: pNFS block layout driverChristoph Hellwig2015-02-057-1/+455
| * | | exportfs: add methods for block layout exportsChristoph Hellwig2015-02-051-0/+23
| * | | nfsd: add trace eventsChristoph Hellwig2015-02-025-3/+85
| * | | nfsd: update documentation for pNFS supportChristoph Hellwig2015-02-021-15/+8
| * | | nfsd: implement pNFS layout recallsChristoph Hellwig2015-02-026-1/+330
| * | | nfsd: implement pNFS operationsChristoph Hellwig2015-02-0216-5/+1324
| * | | nfsd: make find_any_file available outside nfs4state.cChristoph Hellwig2015-02-022-1/+2
| * | | nfsd: make find/get/put file available outside nfs4state.cChristoph Hellwig2015-02-022-8/+9
| * | | nfsd: make lookup/alloc/unhash_stid available outside nfs4state.cChristoph Hellwig2015-02-022-4/+10
| * | | nfsd: add fh_fsid_match helperChristoph Hellwig2015-02-021-0/+9
| * | | nfsd: move nfsd_fh_match to nfsfh.hChristoph Hellwig2015-02-022-10/+11
| * | | fs: add FL_LAYOUT lease typeChristoph Hellwig2015-02-022-4/+26
| * | | fs: track fl_owner for leasesChristoph Hellwig2015-02-022-6/+8
| * | | nfs: add LAYOUT_TYPE_MAX enum valueChristoph Hellwig2015-02-021-0/+1
| * | | Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20J. Bruce Fields2015-02-02328-2117/+3749
| |\ \ \
| * | | | nfsd: factor out a helper to decode nfstime4 valuesChristoph Hellwig2015-01-231-17/+26