Mikulas Patocka
d698aa4500
dm snapshot: add merge target ...
The snapshot-merge target allows a snapshot to be merged back into the
snapshot's origin device.
One anticipated use of snapshot merging is the rollback of filesystems
to back out problematic system upgrades.
This patch adds snapshot-merge target management to both
dm_snapshot_init() and dm_snapshot_exit(). As an initial place-holder,
snapshot-merge is identical to the snapshot target. Documentation is
provided.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2009-12-10 23:52:30 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS
2009-09-23 07:39:28 -07:00
ACPI: update debug parameter documentation
2008-11-07 21:45:29 -05:00
aoe: user can ask driver to forget previously detected devices
2008-02-08 09:22:31 -08:00
ARM: S3C: Update Simtec copyright statements from , to -
2009-12-01 01:33:51 +00:00
includecheck fix: Documentation, cfag12864b-example.c
2009-09-24 07:20:57 -07:00
Blackfin arch: Add document about bfin-gpio
2009-01-07 23:14:38 +08:00
Trivial typo fixes in Documentation/block/data-integrity.txt.
2009-07-01 10:56:25 +02:00
The DRBD driver
2009-10-01 21:17:49 +02:00
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
2009-06-15 21:30:28 -07:00
blkio: Documentation
2009-12-03 19:28:53 +01:00
connector: Provide the sender's credentials to the callback
2009-10-02 10:54:01 -07:00
[CPUFREQ] update Doc for cpuinfo_cur_freq and scaling_cur_freq
2009-09-01 12:45:09 -04:00
cpuidle: Add Documentation
2008-02-14 00:16:13 -05:00
fix random typos
2008-10-16 11:21:30 -07:00
async_tx: add support for asynchronous RAID6 recovery operations
2009-08-29 19:09:27 -07:00
docs: Encourage better changelogs in the development process document
2009-06-04 10:32:49 -06:00
dm snapshot: add merge target
2009-12-10 23:52:30 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2009-12-09 19:52:01 -08:00
driver model: fix show/store prototypes in doc.
2009-07-12 13:02:10 -07:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Documentation: Remove last references to BitKeeper.
2008-04-21 22:19:05 +00:00
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
2009-06-15 21:30:28 -07:00
fbdev: Migrate mailing lists to vger
2009-11-30 13:46:04 -08:00
Doc: better explanation of procs_running
2009-12-09 18:59:52 -08:00
driver core: fix documentation of request_firmware_nowait
2009-06-15 21:30:24 -07:00
move frv docs one level up
2008-02-03 15:54:28 +02:00
hwmon: (adt7475) Add VID support for the ADT7476
2009-12-09 20:36:08 +01:00
i2c-stub: Documentation update
2009-12-06 17:06:30 +01:00
Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS
2009-09-23 07:39:28 -07:00
ide: preserve Host Protected Area by default (v2)
2009-06-07 13:52:52 +02:00
IB: Fix typo in udev rule documentation
2009-10-07 15:35:55 -07:00
Input: add new driver for Sentelic Finger Sensing Pad
2009-08-19 21:46:09 -07:00
drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV
2009-09-24 07:21:03 -07:00
gigaset: add Kernel CAPI interface (v3)
2009-10-06 22:43:53 -07:00
block: rename CONFIG_LBD to CONFIG_LBDAF
2009-06-19 08:08:50 +02:00
kbuild: introduce ld-option
2009-09-20 12:27:42 +02:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
KVM: x86: Add KVM_GET/SET_VCPU_EVENTS
2009-12-03 09:32:25 +02:00
Merge branch 'thinkpad-2.6.32-part2' into release
2009-09-26 01:08:55 -04:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
2009-01-14 19:19:03 +01:00
Doc: use misc-devices/ dir for drivers
2009-12-09 18:59:52 -08:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
ipv4 05/05: add sysctl to accept packets with local source addresses
2009-12-03 12:14:38 -08:00
PCI: document PCIe fundamental reset interfaces
2009-09-09 13:29:38 -07:00
pcmcia: remove now-defunct cs_error, pcmcia_error_{func,ret}
2009-11-09 08:30:06 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
net/can/mpc52xx_can: improve properties and their description
2009-11-17 03:54:04 -08:00
LinuxPPS: core support
2009-06-18 13:04:04 -07:00
generic, x86: add tests for prctl PR_GET_TSC and PR_SET_TSC
2008-04-19 19:19:55 +02:00
rcu: Add synchronize_srcu_expedited() to the documentation
2009-10-26 09:40:31 +01:00
[S390] s390dbf: Add description for usage of "%s" in sprintf events
2009-09-11 10:29:53 +02:00
sched: Documentation/sched-rt-group: Fix style issues & bump version
2009-06-21 13:12:46 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
Create/use more directory structure in the Documentation/ tree.
2008-11-14 17:28:53 +00:00
sh: Kill off remaining CONFIG_SH_KGDB bits.
2008-12-22 18:44:05 +09:00
Merge branch 'topic/hda' into for-linus
2009-12-09 18:16:11 +01:00
sparc: Remove Documentation/sparc/sbus_drivers.txt
2008-08-29 02:15:25 -07:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
remove mention of CONFIG_KMOD from documentation
2008-07-22 19:24:29 +10:00
thermal: sysfs-api.txt - document passive attribute for thermal zones
2009-11-05 18:11:18 -05:00
fix URL in hpet.txt
2009-11-09 09:40:54 +01:00
Merge branch 'perf/core' into perf/probes
2009-11-17 10:17:47 +01:00
USB: Fix sysfs paths in documentation
2009-09-23 06:46:41 -07:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2009-12-09 19:50:49 -08:00
Merge branch 'for-next' into for-linus
2009-12-07 18:36:35 +01:00
ds2482: Discard obsolete detect method
2009-10-04 22:53:41 +02:00
Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS
2009-09-23 07:39:28 -07:00
i2400m: documentation and instructions for usage
2009-01-07 10:00:18 -08:00
USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp
2009-09-23 06:46:39 -07:00
Bluetooth: Add documentation for Marvell Bluetooth driver
2009-08-22 14:25:32 -07:00
Documentation/atomic_ops.txt: fix sample code
2009-06-16 19:47:52 -07:00
Document handling of bad memory
2008-12-03 16:09:53 -07:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
gpio: add bt8xxgpio driver
2008-07-25 10:53:30 -07:00
Bluetooth: Add documentation for Marvell Bluetooth driver
2009-08-22 14:25:32 -07:00
Documentation: add hint about call traces & module symbols to BUG-HUNTING
2008-02-06 10:41:09 -08:00
Documentation/Changes: perl is needed to build the kernel
2009-06-18 13:03:46 -07:00
trivial: fix typo milisecond/millisecond for documentation and source comments.
2009-06-12 18:01:46 +02:00
x86: use possible_cpus=NUM to extend the possible cpus allowed
2008-12-18 12:08:05 +01:00
Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files
2009-10-30 14:59:52 -07:00
CRED: Documentation
2008-11-14 10:39:26 +11:00
Documentation: Clarify when module debugging actually works.
2008-02-03 15:27:38 +02:00
ieee1394: update URLs in debugging-via-ohci1394.txt
2009-10-03 09:28:11 +02:00
trivial: Documentation/dell_rbu.txt: fix typos
2009-06-12 18:01:50 +02:00
lanana: assign a device name and numbering for MAX3100
2009-04-07 08:44:05 -07:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code
2008-07-22 10:39:36 +10:00
use DMA_BIT_MASK instead of inline constant
2009-12-09 18:59:52 -08:00
async_tx, dmaengine: document channel allocation and api rework
2009-01-05 18:10:19 -07:00
SELinux: add .gitignore files for dynamic classes
2009-10-24 09:42:27 +08:00
Dynamic debug: allow simple quoting of words
2009-03-24 16:38:27 -07:00
fix typos/grammos in Documentation/edac.txt
2009-12-04 15:39:53 +01:00
Documentation/email-clients.txt: add some info about gmail
2008-11-06 15:41:19 -08:00
hwmon: (adt7475) Add support for the ADT7473
2009-12-09 20:36:02 +01:00
Update flex_arrays.txt
2009-10-15 07:25:20 -06:00
futex: add requeue-pi documentation
2009-05-09 07:12:50 +02:00
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
2009-09-21 15:14:56 +02:00
correct gpio.txt typos
2009-12-09 18:59:52 -08:00
[SPARC]: Remove SunOS and Solaris binary support.
2008-04-21 15:10:15 -07:00
Remove Andrew Morton's http://www.zip.com.au/~akpm/
2008-10-16 11:21:32 -07:00
hw_random doc updates
2008-03-24 19:22:19 -07:00
use the newc archive format as requested by initramfs
2008-02-03 14:54:41 +02:00
intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
2009-09-19 09:37:23 -07:00
x86, intel_txt: Intel TXT boot support
2009-07-21 11:49:06 -07:00
io mapping: improve documentation
2008-11-03 18:21:44 +01:00
Documentation: move DMA-mapping.txt to Doc/PCI/
2009-01-29 18:19:29 -08:00
Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.
2008-07-26 12:00:06 -07:00
genirq: Expose default irq affinity mask (take 3)
2008-06-05 15:18:30 +02:00
kernel-doc: allow multi-line declaration purpose descriptions
2009-09-18 09:48:52 -07:00
doc: update to URL and status of kernel-docs.txt entry
2008-06-06 11:29:10 -07:00
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 13:35:29 -08:00
keys: allow the callout data to be passed as a blob rather than a string
2008-04-29 08:06:16 -07:00
KEYS: Add a keyctl to install a process's session keyring on its parent [try #6 ]
2009-09-02 21:29:22 +10:00
kmemcheck: update documentation
2009-07-01 22:36:22 +02:00
kmemleak: add clear command support
2009-09-08 16:36:08 +01:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
2009-06-15 21:30:28 -07:00
kref: double kref_put() in my_data_handler()
2009-09-18 09:48:52 -07:00
led: document sysfs interface
2009-08-28 15:21:12 -04:00
leds: LED driver for National Semiconductor LP3944 Funlight Chip
2009-06-23 20:21:38 +01:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
lockdep: Fix typos in documentation
2009-08-07 12:03:46 +02:00
lockstat: contend with points
2008-10-20 15:43:10 +02:00
Revert "linux.conf.au 2009: Tuz"
2009-04-27 12:00:27 -07:00
Revert "linux.conf.au 2009: Tuz"
2009-04-27 12:00:27 -07:00
documentation: update header file paths
2009-01-06 15:59:28 -08:00
docsrc: build Documentation/ sources
2008-08-12 16:07:30 -07:00
docs: fix ManagementStyle book name
2008-10-30 11:38:46 -07:00
The ps2esdi driver was marked as BROKEN more than two years ago due to being
2008-03-17 09:03:05 +01:00
Documentation/md.txt update
2009-03-31 15:18:37 +11:00
sched: Document memory barriers implied by sleep/wake-up primitives
2009-04-29 14:15:55 +02:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
Documentation/memory.txt: remove some very outdated recommendations
2009-09-22 07:17:26 -07:00
x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2
2008-10-30 19:07:04 +01:00
NOMMU: Make mmap allocation page trimming behaviour configurable.
2009-01-08 12:04:47 +00:00
mm: fix NUMA accounting in numastat.txt
2009-09-22 07:17:39 -07:00
docs: Describe the 'C' taint flag in oops-tracing.txt
2009-11-09 09:40:56 +01:00
DOC: add printk-formats.txt
2008-11-12 17:17:17 -08:00
trivial: rbtree.txt: fix rb_entry() parameters in sample code
2009-06-12 18:01:47 +02:00
rfkill: export persistent attribute in sysfs
2009-06-19 11:50:18 -04:00
futex: documentation: fix inconsistent description of futex list_op_pending
2009-06-18 13:03:56 -07:00
rtc: add boot_timesource sysfs attribute
2009-09-23 07:39:46 -07:00
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
selinux: add support for installing a dummy policy (v2)
2008-08-27 08:54:08 +10:00
SLOW_WORK: Move slow_work's proc file to debugfs
2009-12-01 08:20:31 -08:00
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
smack: implement logging V3
2009-04-14 09:00:23 +10:00
Documentation: explain the difference between __bitwise and __bitwise__
2009-04-11 08:18:11 +02:00
Add additional examples in Documentation/spinlocks.txt
2008-04-11 13:21:14 -06:00
Update stable tree documentation
2008-10-29 15:03:49 -07:00
block: rename CONFIG_LBD to CONFIG_LBDAF
2009-06-19 08:08:50 +02:00
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
docs: update patch size in SubmittingPatches
2009-10-01 16:11:12 -07:00
Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense
2009-05-08 19:22:20 -07:00
sysrq, kdump: make sysrq-c consistent
2009-07-29 19:10:36 -07:00
tomoyo: add Documentation/tomoyo.txt
2009-04-14 09:14:58 +10:00
introduce HAVE_EFFICIENT_UNALIGNED_ACCESS Kconfig symbol
2008-07-25 10:53:27 -07:00
PCI/VGA: add VGA arbitration documentation
2009-09-09 13:29:42 -07:00
Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.
2008-07-26 12:00:06 -07:00
d698aa4500
