summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2015-04-2222-128/+633
|\
| * rbd: rbd_wq comment is obsoleteIlya Dryomov2015-04-221-1/+1
| * libceph: announce support for straw2 bucketsIlya Dryomov2015-04-221-1/+15
| * crush: straw2 bucket type with an efficient 64-bit crush_ln()Ilya Dryomov2015-04-225-2/+316
| * crush: ensuring at most num-rep osds are selectedIlya Dryomov2015-04-221-4/+12
| * crush: drop unnecessary include from mapper.cIlya Dryomov2015-04-221-1/+0
| * ceph: fix uninline data functionYan, Zheng2015-04-221-13/+21
| * ceph: rename snapshot supportYan, Zheng2015-04-223-4/+11
| * ceph: fix null pointer dereference in send_mds_reconnect()Yan, Zheng2015-04-221-1/+2
| * ceph: hold on to exclusive caps on complete directoriesYan, Zheng2015-04-201-0/+12
| * libceph: simplify our debugfs attr macroIlya Dryomov2015-04-201-7/+1
| * ceph: show non-default options onlyIlya Dryomov2015-04-201-5/+1
| * libceph: expose client options through debugfsIlya Dryomov2015-04-202-0/+25
| * libceph, ceph: split ceph_show_options()Ilya Dryomov2015-04-203-25/+53
| * rbd: mark block queue as non-rotationalIlya Dryomov2015-04-201-2/+2
| * libceph: don't overwrite specific con error msgsIlya Dryomov2015-04-201-12/+13
| * ceph: cleanup unsafe requests when reconnecting is deniedYan, Zheng2015-04-201-0/+28
| * ceph: don't zero i_wrbuffer_ref when reconnecting is deniedYan, Zheng2015-04-201-7/+0
| * ceph: don't mark dirty caps when there is no auth capYan, Zheng2015-04-202-2/+8
| * ceph: keep i_snap_realm while there are writersYan, Zheng2015-04-201-9/+22
| * libceph: osdmap.h: Add missing format newlinesJoe Perches2015-04-201-3/+2
| * ceph: kstrdup() memory handlingSanidhya Kashyap2015-04-203-13/+44
| * ceph: properly release page upon errorTaesoo Kim2015-04-201-0/+4
| * rbd: be more informative on -ENOENT failuresIlya Dryomov2015-04-201-3/+17
| * ceph: match wait_for_completion_timeout return typeNicholas Mc Guire2015-04-201-4/+5
| * ceph: use msecs_to_jiffies for time conversionNicholas Mc Guire2015-04-201-1/+1
| * ceph: remove redundant declarationFabian Frederick2015-04-201-1/+0
| * ceph: fix dcache/nocache mount optionYan, Zheng2015-04-202-1/+4
| * ceph: drop cap releases in requests composed before cap reconnectYan, Zheng2015-04-201-6/+13
* | Merge tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ros...Linus Torvalds2015-04-222-3/+20
|\ \
| * | tracing: Fix possible out of bounds memory access when parsing enumsSteven Rostedt (Red Hat)2015-04-171-0/+6
| * | tracing: Fix incorrect enabling of trace events by boot cmdlineJoonsoo Kim2015-04-161-1/+8
| * | tracing: Handle ftrace_dump() atomic context in graph_trace_open()Rabin Vincent2015-04-161-2/+6
* | | Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2015-04-223-7/+6
|\ \ \
| * | | ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as...Bjorn Helgaas2015-04-211-4/+1
| * | | MAINTAINERS: Remove Mohit Kumar (email bounces)Bjorn Helgaas2015-04-212-3/+5
* | | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2015-04-228-178/+109
|\ \ \ \
| * | | | watchdog: stmp3xxx_rtc_wdt: fix broken email addressWolfram Sang2015-04-221-2/+2
| * | | | watchdog: pnx4008_wdt: fix broken email addressWolfram Sang2015-04-221-1/+1
| * | | | watchdog: octeon: use fixed length string for register namesAaro Koskinen2015-04-221-1/+1
| * | | | watchdog: octeon: fix some trivial coding style issuesAaro Koskinen2015-04-221-6/+10
| * | | | watchdog: octeon: convert to WATCHDOG_CORE APIAaro Koskinen2015-04-222-147/+39
| * | | | watchdog: cadence: Remove Kconfig dependency on ARCHMichal Simek2015-04-221-1/+0
| * | | | ARM: msm: add watchdog entries to DT timer binding docMathieu Olivari2015-04-221-3/+13
| * | | | ARM: qcom: add description of KPSS WDT for IPQ8064Mathieu Olivari2015-04-221-1/+13
| * | | | watchdog: qcom: use timer devicetree bindingMathieu Olivari2015-04-221-6/+15
| * | | | watchdog: bcm281xx: Remove use of seq_printf return valueJoe Perches2015-04-221-11/+16
* | | | | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2015-04-2224-167/+721
|\ \ \ \ \
| * | | | | virtio: drop virtio_device_is_legacy_onlyMichael S. Tsirkin2015-04-152-8/+0
| * | | | | virtio_pci: support non-legacy balloon devicesMichael S. Tsirkin2015-04-151-3/+0