summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-11-1339-651/+390
|\
| * f2fs: xattr simplificationsAndreas Gruenbacher2015-11-131-12/+3
| * squashfs: xattr simplificationsAndreas Gruenbacher2015-11-131-59/+31
| * 9p: xattr simplificationsAndreas Gruenbacher2015-11-139-306/+83
| * xattr handlers: Pass handler to operations instead of flagsAndreas Gruenbacher2015-11-1332-226/+306
| * jffs2: Add missing capability check for listing trusted xattrsAndreas Gruenbacher2015-11-131-0/+3
| * hfsplus: Remove unused xattr handler list operationsAndreas Gruenbacher2015-11-134-44/+0
| * ubifs: Remove unused security xattr handlerAndreas Gruenbacher2015-11-133-42/+0
| * vfs: Fix the posix_acl_xattr_list return valueAndreas Gruenbacher2015-11-131-3/+1
| * vfs: Check attribute names in posix acl xattr handersAndreas Gruenbacher2015-11-131-0/+4
* | Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2015-11-135-36/+52
|\ \
| * | dax: fix __dax_pmd_fault crashDan Williams2015-11-121-0/+7
| * | libnvdimm: documentation clarificationsKonrad Rzeszutek Wilk2015-11-121-21/+28
| * | libnvdimm, pmem: fix size trim in pmem_direct_access()Dan Williams2015-11-121-13/+2
| * | libnvdimm, e820: fix numa node for e820-type-12 pmem rangesDan Williams2015-11-121-1/+14
| * | tools/testing/nvdimm, acpica: fix flag rename build breakageDan Williams2015-11-121-1/+1
* | | Merge tag 'vfio-v4.4-rc1' of git://github.com/awilliam/linux-vfioLinus Torvalds2015-11-1317-90/+616
|\ \ \
| * | | vfio/pci: make an array largerDan Carpenter2015-11-091-2/+2
| * | | vfio: Include No-IOMMU modeAlex Williamson2015-11-045-10/+209
| * | | vfio: Fix bug in vfio_device_get_from_name()Joerg Roedel2015-11-041-3/+4
| * | | VFIO: platform: reset: AMD xgbe reset moduleEric Auger2015-11-033-0/+137
| * | | vfio: platform: reset: calxedaxgmac: fix ioaddr leakEric Auger2015-11-031-7/+7
| * | | vfio: platform: add dev_info on device resetEric Auger2015-11-032-2/+13
| * | | vfio: platform: use list of registered reset functionEric Auger2015-11-033-30/+30
| * | | vfio: platform: add compat in vfio_platform_deviceEric Auger2015-11-032-7/+9
| * | | vfio: platform: reset: calxedaxgmac: add reset function registrationEric Auger2015-11-031-2/+2
| * | | vfio: platform: introduce module_vfio_reset_handler macroEric Auger2015-11-031-0/+14
| * | | vfio: platform: add capability to register a reset functionEric Auger2015-11-032-0/+47
| * | | vfio: platform: introduce vfio-platform-base moduleEric Auger2015-11-035-4/+18
| * | | vfio/platform: store mapped memory in region, instead of an on-stack copyJames Morse2015-11-031-18/+18
| * | | vfio/type1: handle case where IOMMU does not support PAGE_SIZE sizeEric Auger2015-11-031-1/+14
| * | | VFIO: platform: clear IRQ_NOAUTOEN when de-assigning the IRQEric Auger2015-10-271-0/+1
| * | | vfio/pci: Use kernel VPD access functionsAlex Williamson2015-10-271-1/+69
| * | | vfio: Whitelist PCI bridgesAlex Williamson2015-10-271-6/+25
* | | | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2015-11-139-25/+287
|\ \ \ \
| * | | | Allow copy offload (CopyChunk) across sharesSteve French2015-11-092-15/+8
| * | | | Add resilienthandles mount parmSteve French2015-11-034-1/+53
| * | | | [SMB3] Send durable handle v2 contexts when use of persistent handles requiredSteve French2015-11-034-3/+168
| * | | | [SMB3] Display persistenthandles in /proc/mounts for SMB3 shares if enabledSteve French2015-11-031-0/+2
| * | | | [SMB3] Enable checking for continuous availability and persistent handle supportSteve French2015-11-033-3/+34
| * | | | [SMB3] Add parsing for new mount option controlling persistent handlesSteve French2015-11-032-1/+22
| * | | | Allow duplicate extents in SMB3 not just SMB3.1.1Steve French2015-10-311-3/+1
* | | | | Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2015-11-138-146/+163
|\ \ \ \ \
| * | | | | btrfs: Use fs_info directly in btrfs_delete_unused_bgsZhao Lei2015-11-101-2/+2
| * | | | | btrfs: Fix lost-data-profile caused by balance bgZhao Lei2015-11-101-0/+21
| * | | | | btrfs: Fix lost-data-profile caused by auto removing bgZhao Lei2015-11-101-2/+5
| * | | | | btrfs: Remove len argument from scrub_find_csumZhao Lei2015-11-101-4/+3
| * | | | | btrfs: Reduce unnecessary arguments in scrub_recheck_blockZhao Lei2015-11-101-20/+8
| * | | | | btrfs: Use scrub_checksum_data and scrub_checksum_tree_block for scrub_rechec...Zhao Lei2015-11-101-94/+36
| * | | | | btrfs: Reset sblock->xxx_error stats before calling scrub_recheck_block_checksumZhao Lei2015-11-101-0/+4