Brian Behlendorf
|
49c7595ad8
|
Replace SBUG with PANIC macro
The SBUG macro has been removed from the SPL and replaced
with PANIC which is closer to an existing API. Simply
update the usage in vdev_disk.c.
|
2010-07-20 13:36:50 -07:00 |
|
Brian Behlendorf
|
fc3325257f
|
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:06:25 -07:00 |
|
Brian Behlendorf
|
fb2898fc89
|
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
|
2010-07-17 16:06:22 -07:00 |
|
Brian Behlendorf
|
3fab991620
|
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:06:17 -07:00 |
|
Brian Behlendorf
|
9be3d5bc25
|
Merge commit 'refs/top-bases/linux-topology' into linux-topology
|
2010-07-17 16:06:15 -07:00 |
|
Brian Behlendorf
|
e62753d22a
|
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:06:10 -07:00 |
|
Brian Behlendorf
|
76c6e9ad7f
|
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
|
2010-07-17 16:06:08 -07:00 |
|
Brian Behlendorf
|
25ac57e7e1
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:06:03 -07:00 |
|
Brian Behlendorf
|
09fa5102df
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-07-17 16:06:00 -07:00 |
|
Brian Behlendorf
|
6df6ba41fc
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:55 -07:00 |
|
Brian Behlendorf
|
3042984811
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-07-17 16:05:53 -07:00 |
|
Brian Behlendorf
|
df7f253ec0
|
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:48 -07:00 |
|
Brian Behlendorf
|
bcd7bf7fa3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-07-17 16:05:46 -07:00 |
|
Brian Behlendorf
|
334638aa6e
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:40 -07:00 |
|
Brian Behlendorf
|
8a5cb45557
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-07-17 16:05:38 -07:00 |
|
Brian Behlendorf
|
cf208a7801
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:33 -07:00 |
|
Brian Behlendorf
|
12f93084e3
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-07-17 16:05:31 -07:00 |
|
Brian Behlendorf
|
f03f3fdaab
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:25 -07:00 |
|
Brian Behlendorf
|
33dc7dfe40
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-07-17 16:05:23 -07:00 |
|
Brian Behlendorf
|
22de888edd
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:18 -07:00 |
|
Brian Behlendorf
|
c8d103431d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-07-17 16:05:16 -07:00 |
|
Brian Behlendorf
|
f728bfdb0d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:11 -07:00 |
|
Brian Behlendorf
|
dba6ff35c4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-07-17 16:05:09 -07:00 |
|
Brian Behlendorf
|
2259e385a9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:05:03 -07:00 |
|
Brian Behlendorf
|
df51ecbf9b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-07-17 16:05:01 -07:00 |
|
Brian Behlendorf
|
bb886af0c6
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:04:56 -07:00 |
|
Brian Behlendorf
|
e03cc2e17f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-07-17 16:04:54 -07:00 |
|
Brian Behlendorf
|
efb7c67099
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:04:48 -07:00 |
|
Brian Behlendorf
|
e496029f2c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-07-17 16:04:46 -07:00 |
|
Brian Behlendorf
|
3641455fb0
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:04:41 -07:00 |
|
Brian Behlendorf
|
fadc6b7825
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-07-17 16:04:39 -07:00 |
|
Brian Behlendorf
|
a92799a80e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:04:33 -07:00 |
|
Brian Behlendorf
|
a5243a987b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-07-17 16:04:31 -07:00 |
|
Brian Behlendorf
|
ef1ce6a643
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:04:25 -07:00 |
|
Brian Behlendorf
|
344668d944
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-07-17 16:04:23 -07:00 |
|
Brian Behlendorf
|
b9dd097bab
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-07-17 16:04:18 -07:00 |
|
Brian Behlendorf
|
52707cf42d
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-07-17 16:04:16 -07:00 |
Ned Bass
|
84f737b448
|
Only try to unload modules whose use count is 0
This avoids errors from zfs.sh -u when, for example, zlib_deflate is in
use by btrfs.
|
2010-07-17 16:00:54 -07:00 |
|
Brian Behlendorf
|
57317cf0ee
|
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
|
2010-07-14 12:50:55 -07:00 |
|
Brian Behlendorf
|
14f95cda3e
|
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
|
2010-07-14 12:50:52 -07:00 |
|
Brian Behlendorf
|
2c69548c72
|
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
|
2010-07-14 12:50:47 -07:00 |
|
Brian Behlendorf
|
6e6390e62c
|
Merge commit 'refs/top-bases/linux-topology' into linux-topology
|
2010-07-14 12:50:45 -07:00 |
|
Brian Behlendorf
|
971793b651
|
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
|
2010-07-14 12:50:40 -07:00 |
|
Brian Behlendorf
|
69cb20bf9c
|
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
|
2010-07-14 12:50:38 -07:00 |
|
Brian Behlendorf
|
8b8aae4340
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-07-14 12:50:32 -07:00 |
|
Brian Behlendorf
|
8c7ac9e24f
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-07-14 12:50:30 -07:00 |
|
Brian Behlendorf
|
90cd7dd5cb
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-07-14 12:50:25 -07:00 |
|
Brian Behlendorf
|
d05d40cbcd
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-07-14 12:50:23 -07:00 |
|
Brian Behlendorf
|
59e87ed13f
|
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
|
2010-07-14 12:50:17 -07:00 |
|
Brian Behlendorf
|
0ace5aac42
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-07-14 12:50:15 -07:00 |