summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'libnvdimm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2016-05-2342-787/+2252
|\
| * Merge branch 'for-4.7/dax' into libnvdimm-for-nextDan Williams2016-05-2126-143/+935
| |\
| | * libnvdimm, dax: fix deletionDan Williams2016-05-213-21/+22
| | * libnvdimm, dax: fix alignment validationDan Williams2016-05-211-2/+4
| | * libnvdimm, dax: autodetect supportDan Williams2016-05-205-8/+57
| | * libnvdimm: release ida resourcesDan Williams2016-05-204-0/+15
| | * Revert "block: enable dax for raw block devices"Dan Williams2016-05-204-108/+29
| | * /dev/dax, core: file operations and dax-mmapDan Williams2016-05-204-0/+325
| | * /dev/dax, pmem: direct access to persistent memoryDan Williams2016-05-209-0/+478
| | * libnvdimm: stop requiring a driver ->remove() methodDan Williams2016-05-181-4/+5
| * | Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-nextDan Williams2016-05-1861-725/+1038
| |\ \
| | * | nfit: export subsystem ids as attributesDan Williams2016-04-291-1/+32
| | * | nfit: fix format interface code byte order per ACPI6.1Dan Williams2016-04-281-5/+7
| | * | acpi/nfit: Add sysfs "id" for NVDIMM IDToshi Kani2016-04-261-0/+19
| | * | acpi/nfit: Update nfit driver to comply with ACPI 6.1Toshi Kani2016-04-261-5/+5
| * | | Merge branch 'for-4.7/dsm' into libnvdimm-for-nextDan Williams2016-05-1811-58/+283
| |\ \ \
| | * | | nfit: add sysfs dimm 'family' and 'dsm_mask' attributesDan Williams2016-05-051-0/+26
| | * | | tools/testing/nvdimm: ND_CMD_CALL supportDan Williams2016-05-051-3/+18
| | * | | nfit: disable vendor specific commandsDan Williams2016-05-051-4/+13
| | * | | nfit, libnvdimm: limited/whitelisted dimm command marshaling mechanismDan Williams2016-04-284-17/+179
| | * | | nfit, libnvdimm: clarify "commands" vs "_DSMs"Dan Williams2016-04-288-37/+50
| | * | | libnvdimm: increase max envelope size for ioctlJerry Hoemann2016-04-281-1/+1
| | * | | acpi: widen acpi_evaluate_dsm() revision and function-index argumentsJerry Hoemann2016-04-112-5/+5
| * | | | Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-nextDan Williams2016-05-186-6/+158
| |\ \ \ \
| | * | | | libnvdimm, btt: add btt startup debugDan Williams2016-04-221-1/+5
| | * | | | libnvdimm, nfit: Use ACPI_SIG_NFIT instead of hard coded stringLee, Chun-Yi2016-04-111-1/+1
| | * | | | libnvdimm, test: add mock SMART data payloadDan Williams2016-04-113-1/+82
| | * | | | libnvdimm, nfit: report multiple interface codes per-dimmDan Williams2016-04-112-3/+70
| | |/ / /
| * | | | Merge branch 'for-4.7/dax' into libnvdimm-for-nextDan Williams2016-05-1820-594/+837
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | libnvdimm, dax: record the specified alignment of a dax-device instanceDan Williams2016-05-092-3/+9
| | * | | libnvdimm, dax: reserve space to store labels for device-daxDan Williams2016-05-091-3/+5
| | * | | libnvdimm, dax: introduce device-dax infrastructureDan Williams2016-05-0913-34/+264
| | * | | libnvdimm: cleanup nvdimm_namespace_common_probe(), kill 'host'Dan Williams2016-04-221-12/+7
| | * | | libnvdimm, pmem: kill ->pmem_queue and ->pmem_diskDan Williams2016-04-221-13/+8
| | * | | libnvdimm, pmem, pfn: move pfn setup to the coreDan Williams2016-04-223-184/+188
| | * | | libnvdimm, pmem, pfn: make pmem_rw_bytes generic and refactor pfn setupDan Williams2016-04-229-173/+211
| | * | | libnvdimm, pmem: clean up resource print / requestDan Williams2016-04-221-4/+3
| | * | | libnvdimm, pmem: use devm_add_action to release bdev resourcesDan Williams2016-04-221-49/+39
| | * | | libnvdimm, blk: move i/o infrastructure to nd_namespace_blkDan Williams2016-04-222-68/+71
| | * | | libnvdimm, blk: quiet i/o error reportingDan Williams2016-04-221-1/+1
| | * | | libnvdimm, pmem: use ->queuedata for driver private dataDan Williams2016-04-221-5/+4
| | * | | libnvdimm, blk: use ->queuedata for driver private dataDan Williams2016-04-221-4/+2
| | * | | libnvdimm, blk: use devm_add_action to release bdev resourcesDan Williams2016-04-221-41/+36
| | * | | libnvdimm, btt, convert nd_btt_probe() to devmDan Williams2016-04-225-28/+25
| | * | | libnvdimm, pfn, convert nd_pfn_probe() to devmDan Williams2016-04-223-37/+26
| | * | | libnvdimm, pmem: kill pmem->ndnsDan Williams2016-04-224-22/+25
* | | | | Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ros...Linus Torvalds2016-05-223-4/+147
|\ \ \ \ \
| * | | | | ftrace/x86: Set ftrace_stub to weak to prevent gcc from using short jumps to itSteven Rostedt2016-05-201-1/+2
| * | | | | ftrace: Don't disable irqs when taking the tasklist_lock read_lockSoumya PN2016-05-201-3/+2
| * | | | | ftracetest: Add instance created, delete, read and enable event testSteven Rostedt (Red Hat)2016-05-091-0/+143
OpenPOWER on IntegriCloud