summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2011-01-06vga_switcheroo: fix prototype for non CONFIG_VGA_SWITCHEROO buildStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2011-01-06[SCSI] target: Add LIO target core v4.0.0-rc6Nicholas Bellinger
LIO target is a full featured in-kernel target framework with the following feature set: High-performance, non-blocking, multithreaded architecture with SIMD support. Advanced SCSI feature set: * Persistent Reservations (PRs) * Asymmetric Logical Unit Assignment (ALUA) * Protocol and intra-nexus multiplexing, load-balancing and failover (MC/S) * Full Error Recovery (ERL=0,1,2) * Active/active task migration and session continuation (ERL=2) * Thin LUN provisioning (UNMAP and WRITE_SAMExx) Multiprotocol target plugins Storage media independence: * Virtualization of all storage media; transparent mapping of IO to LUNs * No hard limits on number of LUNs per Target; maximum LUN size ~750 TB * Backstores: SATA, SAS, SCSI, BluRay, DVD, FLASH, USB, ramdisk, etc. Standards compliance: * Full compliance with IETF (RFC 3720) * Full implementation of SPC-4 PRs and ALUA Significant code cleanups done by Christoph Hellwig. [jejb: fix up for new block bdev exclusive interface. Minor fixes from Randy Dunlap and Dan Carpenter.] Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
2011-01-06Merge remote branch 'cleancache/linux-next'Stephen Rothwell
Conflicts: fs/ocfs2/super.c fs/super.c include/linux/fs.h mm/Kconfig
2011-01-06Merge remote branch 'bkl-config/config'Stephen Rothwell
Conflicts: arch/powerpc/kernel/setup_64.c drivers/staging/stradis/Kconfig fs/nfsd/nfs4state.c include/linux/hardirq.h include/linux/smp_lock.h
2011-01-06Merge remote branch 'staging/staging-next'Stephen Rothwell
2011-01-06Merge remote branch 'usb/usb-next'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/Kconfig arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/clock44xx_data.c arch/sh/Kconfig drivers/usb/Kconfig drivers/usb/host/ehci-hcd.c
2011-01-06Merge remote branch 'tty/tty-next'Stephen Rothwell
2011-01-06Merge remote branch 'driver-core/driver-core-next'Stephen Rothwell
2011-01-06Merge remote branch 'workqueues/for-next'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt drivers/media/video/bt8xx/bttv-input.c drivers/rtc/rtc-dev.c
2011-01-06Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/apic/nmi.c arch/x86/kernel/apic/x2apic_uv_x.c arch/x86/kernel/process.c
2011-01-06Merge remote branch 'swiotlb-xen/master'Stephen Rothwell
Conflicts: drivers/xen/Kconfig drivers/xen/Makefile
2011-01-06Merge remote branch 'xen/upstream/xen'Stephen Rothwell
2011-01-06Merge remote branch 'tip/auto-latest'Stephen Rothwell
2011-01-06Merge remote branch 'spi/next-spi'Stephen Rothwell
Conflicts: arch/arm/mach-pxa/devices.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/z2.c include/linux/spi/pxa2xx_spi.h
2011-01-06Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
Conflicts: arch/sparc/prom/tree_32.c drivers/mtd/Kconfig
2011-01-06Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig
2011-01-06Merge remote branch 'fsnotify/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'suspend/linux-next'Stephen Rothwell
2011-01-06Merge remote branch 'trivial/for-next'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c fs/ext4/ext4.h
2011-01-06Merge remote branch 'selinux/master'Stephen Rothwell
2011-01-06Merge remote branch 'security-testing/next'Stephen Rothwell
2011-01-06Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/core.c drivers/regulator/mc13783-regulator.c
2011-01-06Merge remote branch 'fbdev/master'Stephen Rothwell
Conflicts: drivers/video/sh_mobile_lcdcfb.c
2011-01-06Merge remote branch 'drm/drm-next'Stephen Rothwell
2011-01-06Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/Makefile drivers/mfd/wm8994-core.c
2011-01-06Merge remote branch 'slab/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'mmc/mmc-next'Stephen Rothwell
2011-01-06Merge remote branch 'battery/master'Stephen Rothwell
2011-01-06Merge branch 'quilt/device-mapper'Stephen Rothwell
2011-01-06Merge remote branch 'block/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'input/next'Stephen Rothwell
Conflicts: drivers/input/keyboard/Kconfig include/linux/input.h
2011-01-06Merge remote branch 'sound/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'mtd/master'Stephen Rothwell
2011-01-06Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: net/bluetooth/Makefile
2011-01-06Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/skge.c drivers/net/sky2.c net/9p/protocol.c
2011-01-06Merge remote branch 'scsi/master'Stephen Rothwell
2011-01-06Merge remote branch 'kvm/linux-next'Stephen Rothwell
2011-01-06Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'acpi/test'Stephen Rothwell
2011-01-06Merge remote branch 'libata/NEXT'Stephen Rothwell
2011-01-06Merge remote branch 'kbuild/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2011-01-06Merge remote branch 'bjdooks-i2c/next-i2c'Stephen Rothwell
Conflicts: arch/arm/mach-pxa/pxa27x.c arch/arm/mach-pxa/pxa3xx.c arch/arm/mach-pxa/trizeps4.c
2011-01-06Merge branch 'quilt/i2c'Stephen Rothwell
2011-01-06Merge remote branch 'hid/for-next'Stephen Rothwell
2011-01-06Merge remote branch 'pci/linux-next'Stephen Rothwell
2011-01-06Merge remote branch 'vfs-scale/vfs-scale-working'Stephen Rothwell
Conflicts: fs/9p/vfs_inode.c fs/cifs/dir.c fs/fuse/inode.c fs/hfsplus/hfsplus_fs.h fs/hfsplus/unicode.c fs/xfs/xfs_iget.c
2011-01-06Merge remote branch 'nfsd/nfsd-next'Stephen Rothwell
Conflicts: Documentation/filesystems/Locking
2011-01-06Merge remote branch 'nfs/linux-next'Stephen Rothwell
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 16:59:16 +0000