]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:54:07 +0000 (14:54 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'

12 years agoMerge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:52:45 +0000 (14:52 +1100)]
Merge remote-tracking branch 'spi/spi/next'

12 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:50:19 +0000 (14:50 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:48:59 +0000 (14:48 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

12 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 14 Oct 2011 03:47:40 +0000 (14:47 +1100)]
Merge remote-tracking branch 'edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:44:32 +0000 (14:44 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

12 years agoMerge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:43:08 +0000 (14:43 +1100)]
Merge remote-tracking branch 'apm/for-next'

12 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:36:39 +0000 (14:36 +1100)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:32:23 +0000 (14:32 +1100)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/ide/Kconfig
drivers/net/Kconfig

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:25:06 +0000 (14:25 +1100)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:19:09 +0000 (14:19 +1100)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Fri, 14 Oct 2011 03:17:49 +0000 (14:17 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'

12 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 14 Oct 2011 03:17:39 +0000 (14:17 +1100)]
Merge remote-tracking branch 'watchdog/master'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:10:55 +0000 (14:10 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:09:24 +0000 (14:09 +1100)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:08:03 +0000 (14:08 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c

12 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:03:25 +0000 (14:03 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig

12 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:01:48 +0000 (14:01 +1100)]
Merge remote-tracking branch 'drm/drm-next'

12 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:00:21 +0000 (14:00 +1100)]
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-u300/include/mach/irqs.h

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:58:54 +0000 (13:58 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:52:22 +0000 (13:52 +1100)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:52:12 +0000 (13:52 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:50:50 +0000 (13:50 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/host/au1xmmc.c

12 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Fri, 14 Oct 2011 02:50:39 +0000 (13:50 +1100)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

12 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:48:31 +0000 (13:48 +1100)]
Merge remote-tracking branch 'battery/master'

12 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 14 Oct 2011 02:47:01 +0000 (13:47 +1100)]
Merge branch 'quilt/device-mapper'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:44:51 +0000 (13:44 +1100)]
Merge remote-tracking branch 'block/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 14 Oct 2011 02:43:02 +0000 (13:43 +1100)]
Merge remote-tracking branch 'input/next'

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Fri, 14 Oct 2011 02:41:34 +0000 (13:41 +1100)]
Merge branch 'quilt/rr'

12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Fri, 14 Oct 2011 02:40:14 +0000 (13:40 +1100)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:38:54 +0000 (13:38 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:36:35 +0000 (13:36 +1100)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/plat-omap/devices.c
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:30:52 +0000 (13:30 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:29:31 +0000 (13:29 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:28:13 +0000 (13:28 +1100)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c

12 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:26:28 +0000 (13:26 +1100)]
Merge remote-tracking branch 'wireless/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:19:42 +0000 (13:19 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 14 Oct 2011 02:14:27 +0000 (13:14 +1100)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:12:15 +0000 (13:12 +1100)]
Merge remote-tracking branch 'scsi/master'

12 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:12:10 +0000 (13:12 +1100)]
Merge remote-tracking branch 'ibft/master'

12 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:12:03 +0000 (13:12 +1100)]
Merge remote-tracking branch 'swiotlb/master'

12 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:10:43 +0000 (13:10 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'

12 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:09:02 +0000 (13:09 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 14 Oct 2011 02:07:43 +0000 (13:07 +1100)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:07:38 +0000 (13:07 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:06:11 +0000 (13:06 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:04:27 +0000 (13:04 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

12 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Fri, 14 Oct 2011 02:03:08 +0000 (13:03 +1100)]
Merge remote-tracking branch 'docs/docs-move'

12 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Fri, 14 Oct 2011 02:01:55 +0000 (13:01 +1100)]
Merge branch 'quilt/kernel-doc'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:00:33 +0000 (13:00 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 14 Oct 2011 01:59:21 +0000 (12:59 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Fri, 14 Oct 2011 01:58:02 +0000 (12:58 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Fri, 14 Oct 2011 01:56:50 +0000 (12:56 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:55:32 +0000 (12:55 +1100)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-wacom.c

12 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:54:01 +0000 (12:54 +1100)]
Merge remote-tracking branch 'xfs/master'

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:52:46 +0000 (12:52 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:51:20 +0000 (12:51 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:45:14 +0000 (12:45 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:44:00 +0000 (12:44 +1100)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:42:43 +0000 (12:42 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 14 Oct 2011 01:39:55 +0000 (12:39 +1100)]
Merge remote-tracking branch 'ext3/for_next'

12 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:38:31 +0000 (12:38 +1100)]
Merge remote-tracking branch 'cifs/master'

12 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:37:10 +0000 (12:37 +1100)]
Merge remote-tracking branch 'ceph/for-next'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:35:59 +0000 (12:35 +1100)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 14 Oct 2011 01:34:45 +0000 (12:34 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:33:31 +0000 (12:33 +1100)]
Merge remote-tracking branch 'tile/master'

12 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Fri, 14 Oct 2011 01:32:16 +0000 (12:32 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

12 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 14 Oct 2011 01:31:05 +0000 (12:31 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 14 Oct 2011 01:24:38 +0000 (12:24 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Fri, 14 Oct 2011 01:23:19 +0000 (12:23 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)]
Merge remote-tracking branch 'powerpc/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:15:40 +0000 (12:15 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:14:19 +0000 (12:14 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:13:00 +0000 (12:13 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:11:48 +0000 (12:11 +1100)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Fri, 14 Oct 2011 01:10:33 +0000 (12:10 +1100)]
Merge remote-tracking branch 'ia64/next'

12 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Fri, 14 Oct 2011 01:09:09 +0000 (12:09 +1100)]
Merge branch 'quilt/hexagon'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:07:45 +0000 (12:07 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:01:21 +0000 (12:01 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Fri, 14 Oct 2011 01:00:10 +0000 (12:00 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:58:52 +0000 (11:58 +1100)]
Merge remote-tracking branch 'tegra/for-next'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:55:31 +0000 (11:55 +1100)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:54:08 +0000 (11:54 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/mm.c

12 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:52:44 +0000 (11:52 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9g45.c

12 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:46:45 +0000 (11:46 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:44:08 +0000 (11:44 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 00:42:49 +0000 (11:42 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Fri, 14 Oct 2011 00:41:33 +0000 (11:41 +1100)]
Merge remote-tracking branch 'ide/master'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 14 Oct 2011 00:41:26 +0000 (11:41 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Fri, 14 Oct 2011 00:41:25 +0000 (11:41 +1100)]
Merge remote-tracking branch 'sparc/master'

12 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Fri, 14 Oct 2011 00:41:24 +0000 (11:41 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'

12 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Fri, 14 Oct 2011 00:41:23 +0000 (11:41 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

12 years agoInitial EXPERIMENTAL implementation of device-mapper thin provisioning
Joe Thornber [Fri, 14 Oct 2011 00:29:04 +0000 (11:29 +1100)]
Initial EXPERIMENTAL implementation of device-mapper thin provisioning
with snapshot support.  The 'thin' target is used to create instances of
the virtual devices that are hosted in the 'thin-pool' target.  The
thin-pool target provides data sharing among devices.  This sharing is
made possible using the persistent-data library in the previous patch.

The main highlight of this implementation, compared to the previous
implementation of snapshots, is that it allows many virtual devices to
be stored on the same data volume, simplifying administration and
allowing sharing of data between volumes (thus reducing disk usage).

Another big feature is support for arbitrary depth of recursive
snapshots (snapshots of snapshots of snapshots ...).  The previous
implementation of snapshots did this by chaining together lookup tables,
and so performance was O(depth).  This new implementation uses a single
data structure so we don't get this degradation with depth.

For further information and examples of how to use this, please read
Documentation/device-mapper/thin-provisioning.txt

Signed-off-by: Joe Thornber <thornber@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
12 years agoThe persistent-data library offers a re-usable framework for the storage
Joe Thornber [Fri, 14 Oct 2011 00:29:03 +0000 (11:29 +1100)]
The persistent-data library offers a re-usable framework for the storage
and management of on-disk metadata in device-mapper targets.

It's used by the thin-provisioning target in the next patch and in an
upcoming hierarchical storage target.

For further information, please read
Documentation/device-mapper/persistent-data.txt

Signed-off-by: Joe Thornber <thornber@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
12 years agocifs: clean up check_rfc1002_header
Jeff Layton [Tue, 11 Oct 2011 10:41:32 +0000 (06:41 -0400)]
cifs: clean up check_rfc1002_header

Rename it for better clarity as to what it does and have the caller pass
in just the single type byte. Turn the if statement into a switch and
optimize it by placing the most common message type at the top. Move the
header length check back into cifs_demultiplex_thread in preparation
for adding a new receive phase and normalize the cFYI messages.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
12 years agoMerge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next
Olof Johansson [Thu, 13 Oct 2011 23:33:40 +0000 (16:33 -0700)]
Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next

12 years agovirtio-pci: Use PCI MMIO instead of PIO when available
Alexey Kardashevskiy [Wed, 12 Oct 2011 03:39:06 +0000 (14:39 +1100)]
virtio-pci: Use PCI MMIO instead of PIO when available

Currently virtio-pci is specced so that configuration of the device is
done through a PCI IO space (via BAR 0 of the virtual PCI device).
However, use of PCI IO space (aka PIO) is long deprecated, and can be
awkward to use on some systems (for example IBM pSeries machines
typically have many PCI domains, and not all firmware/hypervisor
versions necessarily support PCI PIO access on all domains).

Therefore, it would be preferable for the virtio virtual PCI device to
advertise a PCI memory space (aka MMIO) BAR and have configuration
done through this interface instead.  This can be done backwards
compatibly by advertising the MMIO BAR in addition to the existing PIO
BAR so that the guest driver can choose whichever interface.

In anticipation of adding such an MMIO BAR to virtio host-side
implementations (e.g. qemu), this patch updates the Linux virtio-pci
driver to attempt to use BAR 2 (which will be MMIO) in preference to
the existing PIO BAR 0.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: Dont add "config" to list for !per_vq_vector
Krishna Kumar [Wed, 5 Oct 2011 05:38:59 +0000 (11:08 +0530)]
virtio: Dont add "config" to list for !per_vq_vector

For the MSI but non-per_vq_vector case, the config/change vq
also gets added to the list of vqs that need to process the
MSI interrupt. This is not needed as config has it's own
handler (vp_config_changed). In any case, vring_interrupt()
finds nothing needs to be done on this vq.

I tested this patch by testing the "Fallback:" and "Finally
fall back" cases in vp_find_vqs(). Please review.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: wait for first console port for early console output
Christian Borntraeger [Thu, 22 Sep 2011 18:14:23 +0000 (23:44 +0530)]
virtio: console: wait for first console port for early console output

On s390 I have seen some random

"Warning: unable to open an initial console"

boot failure. Turns out that tty_open fails, because the
hvc_alloc was not yet done. In former times this could not happen,
since the probe function automatically called hvc_alloc. With newer
versions (multiport) some host<->guest interaction is required
before hvc_alloc is called. This might be too late, especially if
an initramfs is involved. Lets use a completion if we have
multiport and an early console.

[Amit:
  * Use NULL instead of 0 for pointer comparison
  * Rename 'port_added' to 'early_console_added'
  * Re-format, re-word commit message
  * Rebase patch on top of current queue]

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Chrstian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>