ecashin@coraid.com [Tue, 19 Apr 2005 05:00:18 +0000 (22:00 -0700)]
[PATCH] aoe 2/12: allow multiple aoe devices with same MAC
allow multiple aoe devices with same MAC addr
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ecashin@coraid.com [Tue, 19 Apr 2005 05:00:17 +0000 (22:00 -0700)]
[PATCH] aoe 1/12: remove too-low cap on minor number
remove too-low cap on minor number
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
James Bottomley [Tue, 19 Apr 2005 01:55:09 +0000 (20:55 -0500)]
fully merge up to scsi-misc-2.6
Linus Torvalds [Mon, 18 Apr 2005 23:25:10 +0000 (16:25 -0700)]
Merge ... kernel.org:/home/rmk/linux-2.6-rmk.git
This adds the missing arch/arm/lib/bitops.h file.
David S. Miller [Mon, 18 Apr 2005 22:13:15 +0000 (15:13 -0700)]
[PATCH] sparc64: Fix stat
Like Alpha, sparc64's struct stat was defined before we had the
nanosecond et al. fields added. So like Alpha I have to cons up a
struct stat64 to get this stuff. I'll work on the glibc bits soon.
Also, we were forgetting to fill in the nanosecond fields in the sparc
compat stat64 syscalls.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Mon, 18 Apr 2005 21:50:01 +0000 (22:50 +0100)]
[PATCH] ARM: Add missing new file for bitops patch
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Linus Torvalds [Mon, 18 Apr 2005 21:25:40 +0000 (14:25 -0700)]
Merge SCSI tree from James Bottomley.
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.