Brian Behlendorf
|
917a08a678
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-08-18 12:34:56 -07:00 |
|
Brian Behlendorf
|
79c98b6d13
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:34:43 -07:00 |
|
Brian Behlendorf
|
a1909790e4
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-08-18 12:34:40 -07:00 |
|
Brian Behlendorf
|
b9f7ba534b
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:34:27 -07:00 |
|
Brian Behlendorf
|
5f0eb517cf
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-08-18 12:34:24 -07:00 |
|
Brian Behlendorf
|
e4fd5cfe2d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:34:12 -07:00 |
|
Brian Behlendorf
|
1cf9e2582c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-08-18 12:34:09 -07:00 |
|
Brian Behlendorf
|
ed0cc120bc
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:33:57 -07:00 |
|
Brian Behlendorf
|
b3561355b8
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-08-18 12:33:54 -07:00 |
|
Brian Behlendorf
|
905e51b755
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:33:41 -07:00 |
|
Brian Behlendorf
|
6a97dcc2bf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-08-18 12:33:39 -07:00 |
|
Brian Behlendorf
|
7c3b0a4a2f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-08-18 12:33:35 -07:00 |
|
Brian Behlendorf
|
3a2102242d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:33:13 -07:00 |
|
Brian Behlendorf
|
c9519311a3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-08-18 12:33:10 -07:00 |
|
Brian Behlendorf
|
954484f75d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
|
2009-08-18 12:32:53 -07:00 |
|
Brian Behlendorf
|
5e2c5e25ed
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:30:23 -07:00 |
|
Brian Behlendorf
|
715534d082
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-08-18 12:30:20 -07:00 |
|
Brian Behlendorf
|
104e605279
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:30:07 -07:00 |
|
Brian Behlendorf
|
df5482e65d
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-08-18 12:30:04 -07:00 |
|
Brian Behlendorf
|
bfbf28a0d1
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:29:51 -07:00 |
|
Brian Behlendorf
|
2d067983d6
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-08-18 12:29:48 -07:00 |
|
Brian Behlendorf
|
a50eeb2abe
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:29:35 -07:00 |
|
Brian Behlendorf
|
f301459f0e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-08-18 12:29:32 -07:00 |
|
Brian Behlendorf
|
769cc6425e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-08-18 12:29:19 -07:00 |
|
Brian Behlendorf
|
d5cfd05528
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-08-18 12:29:16 -07:00 |
|
Brian Behlendorf
|
c67303e092
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
|
2009-08-18 12:26:09 -07:00 |
|
Brian Behlendorf
|
198b2f4f04
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-08-18 12:11:01 -07:00 |
|
Brian Behlendorf
|
50c623ccef
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-08-18 12:10:55 -07:00 |
|
Brian Behlendorf
|
ef0204794a
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-08-18 12:10:51 -07:00 |
|
Brian Behlendorf
|
799792cf1c
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-08-18 12:10:49 -07:00 |
|
Brian Behlendorf
|
8aab887b7c
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2009-08-18 12:10:47 -07:00 |
|
Brian Behlendorf
|
33143ae6ad
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-08-18 12:10:47 -07:00 |
|
Brian Behlendorf
|
5a81224e6f
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-08-18 12:10:43 -07:00 |
|
Brian Behlendorf
|
bfbac5daec
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-08-18 12:10:38 -07:00 |
|
Brian Behlendorf
|
4f6bbcd0e7
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-08-18 12:10:36 -07:00 |
|
Brian Behlendorf
|
3fd8eb337b
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-08-18 12:10:30 -07:00 |
|
Brian Behlendorf
|
e24611a2a9
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-08-18 12:10:28 -07:00 |
|
Brian Behlendorf
|
7945050987
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2009-08-18 12:10:24 -07:00 |
|
Brian Behlendorf
|
3206fa76cc
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2009-08-18 12:10:23 -07:00 |
|
Brian Behlendorf
|
bd4a1cc4ef
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-08-18 12:10:18 -07:00 |
|
Brian Behlendorf
|
fe373ddad8
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2009-08-18 12:10:17 -07:00 |
|
Brian Behlendorf
|
5e33dd44ae
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2009-08-18 12:10:13 -07:00 |
|
Brian Behlendorf
|
c77ce6cb93
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2009-08-18 12:10:12 -07:00 |
|
Brian Behlendorf
|
0d46ebf0ff
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-08-18 12:10:08 -07:00 |
|
Brian Behlendorf
|
ae5bc5970d
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2009-08-18 12:10:07 -07:00 |
|
Brian Behlendorf
|
8a8490b570
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2009-08-18 12:10:03 -07:00 |
|
Brian Behlendorf
|
e20ba40c91
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2009-08-18 12:10:02 -07:00 |
|
Brian Behlendorf
|
12c361b1a1
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2009-08-18 12:09:58 -07:00 |
|
Brian Behlendorf
|
f8cca2b295
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-08-18 12:09:57 -07:00 |
|
Brian Behlendorf
|
0911c7f7c3
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-08-18 12:09:53 -07:00 |